Merge remote-tracking branch 'remotes/origin/3.3.5' into 3.3.5-nemesis_anticheat

# Conflicts:
#	src/server/game/Entities/Player/Player.cpp

Author: jackpoz

cmake/compiler/clang/settings.cmake

@@ -58,9 +58,9 @@ endif()
 if(WITH_COREDEBUG)
   target_compile_options(trinity-compile-option-interface
     INTERFACE
-      -g3)
+      -g3 -glldb)
 
-  message(STATUS "Clang: Debug-flags set (-g3)")
+  message(STATUS "Clang: Debug-flags set (-g3 -glldb)")
 endif()
 
 if(ASAN)
@@ -129,11 +129,12 @@ endif()
 
 # -Wno-narrowing needed to suppress a warning in g3d
 # -Wno-deprecated-register is needed to suppress 185 gsoap warnings on Unix systems.
-# -Wno-deprecated-copy needed to suppress a warning in g3d
+# -Wno-undefined-inline needed for a compile time optimization hack with fmt
 target_compile_options(trinity-compile-option-interface
   INTERFACE
     -Wno-narrowing
-    -Wno-deprecated-register)
+    -Wno-deprecated-register
+    -Wno-undefined-inline)
 
 if(BUILD_SHARED_LIBS)
   # -fPIC is needed to allow static linking in shared libs.

cmake/compiler/gcc/settings.cmake

@@ -44,9 +44,9 @@ endif()
 if(WITH_COREDEBUG)
   target_compile_options(trinity-compile-option-interface
     INTERFACE
-      -g3)
+      -ggdb3)
 
-  message(STATUS "GCC: Debug-flags set (-g3)")
+  message(STATUS "GCC: Debug-flags set (-ggdb3)")
 endif()
 
 if(ASAN)

contrib/extractor.sh

@@ -2,39 +2,39 @@
 
 # Set client and server directories as environment variables
 # if you don't want to enter them here
-if [ -z $CLIENT_DIR ]; then
+if [ -z "$CLIENT_DIR" ]; then
 echo -n "Enter directory where client files are located: "
 read CLIENT_DIR
 
-if ! cd $CLIENT_DIR; then
+if ! cd "$CLIENT_DIR"; then
         echo "Cannot access $CLIENT_DIR"
         exit 1
 fi
-if [ ! -d $CLIENT_DIR/Data ]; then
+if [ ! -d "$CLIENT_DIR/Data" ]; then
         echo "Cannot find client files in $CLIENT_DIR"
         exit 1
 fi
 fi
 
-if [ -z $SERVER_DIR ]; then
+if [ -z "$SERVER_DIR" ]; then
 echo -n "Enter directory where server files are located: "
 read SERVER_DIR
 
-if ! cd $SERVER_DIR; then
+if ! cd "$SERVER_DIR"; then
         echo "Cannot access $SERVER_DIR"
         exit 1
 fi
 fi
 
 # These should all be correct on a standard installation
-DATA_DIR=${SERVER_DIR}/data
-MAPEXTRACTOR=${SERVER_DIR}/bin/mapextractor
-VMAP4EXTRACTOR=${SERVER_DIR}/bin/vmap4extractor
-VMAP4ASSEMBLER=${SERVER_DIR}/bin/vmap4assembler
-MMAPS_GENERATOR=${SERVER_DIR}/bin/mmaps_generator
+DATA_DIR="${SERVER_DIR}/data"
+MAPEXTRACTOR="${SERVER_DIR}/bin/mapextractor"
+VMAP4EXTRACTOR="${SERVER_DIR}/bin/vmap4extractor"
+VMAP4ASSEMBLER="${SERVER_DIR}/bin/vmap4assembler"
+MMAPS_GENERATOR="${SERVER_DIR}/bin/mmaps_generator"
 
 check_files() {
-for i in $MAPEXTRACTOR $VMAP4EXTRACTOR $VMAP4ASSEMBLER $MMAPS_GENERATOR
+for i in "$MAPEXTRACTOR" "$VMAP4EXTRACTOR" "$VMAP4ASSEMBLER" "$MMAPS_GENERATOR"
 do
 	if [[ ! -x $i ]]
 	then
@@ -62,23 +62,23 @@ echo "Extracting DBC, Camera and Maps files"
 echo
 echo "-- Using $MAPEXTRACTOR"
 echo "-- Copying extracted data to ${DATA_DIR}"
-if [[ ! -d ${DATA_DIR} ]]
+if [[ ! -d "${DATA_DIR}" ]]
 then
 	echo "-- Creating ${DATA_DIR}"
-	mkdir ${DATA_DIR}
+	mkdir "${DATA_DIR}"
 fi
 echo "-- Starting in 5 seconds"
 sleep 5
 
-cd ${CLIENT_DIR}
-$MAPEXTRACTOR
+cd "${CLIENT_DIR}"
+"$MAPEXTRACTOR"
 
 echo "-- Extraction complete, copying dbc and maps files"
-cp -r dbc maps ${DATA_DIR}
-if [[ -d ${CLIENT_DIR}/Cameras ]]
+cp -r dbc maps "${DATA_DIR}"
+if [[ -d "${CLIENT_DIR}/Cameras" ]]
 then
 	echo "-- Camera files found, copying"
-	cp -r Cameras ${DATA_DIR}
+	cp -r Cameras "${DATA_DIR}"
 fi
 
 echo "-- Done"
@@ -95,13 +95,13 @@ echo "-- Copying extracted data to ${DATA_DIR}/vmaps"
 echo "-- Starting in 5 seconds"
 sleep 5
 
-cd ${CLIENT_DIR}
-$VMAP4EXTRACTOR
+cd "${CLIENT_DIR}"
+"$VMAP4EXTRACTOR"
 mkdir vmaps
-$VMAP4ASSEMBLER Buildings vmaps
+"$VMAP4ASSEMBLER" Buildings vmaps
 
 echo "-- Extraction complete, copying files"
-cp -r vmaps ${DATA_DIR}
+cp -r vmaps "${DATA_DIR}"
 echo "-- Done"
 echo
 }
@@ -115,11 +115,11 @@ echo "-- Copying extracted data to ${DATA_DIR}/mmaps"
 echo "-- Starting in 5 seconds"
 sleep 5
 
-cd ${CLIENT_DIR}
+cd "${CLIENT_DIR}"
 mkdir mmaps
-$MMAPS_GENERATOR
+"$MMAPS_GENERATOR"
 echo "-- Extraction complete, copying files"
-cp -r mmaps ${DATA_DIR}
+cp -r mmaps "${DATA_DIR}"
 echo "-- Done"
 echo
 }
@@ -135,7 +135,7 @@ echo "Enter y to continue or anything else to cancel"
 read a
 if [[ ${a} = "y" ]]
 then
-	cd ${CLIENT_DIR}
+	cd "${CLIENT_DIR}"
 	rm -fr Buildings Cameras dbc maps mmaps vmaps
 	echo "Done"
 fi

dep/CMakeLists.txt

@@ -20,7 +20,9 @@ if(SERVERS OR TOOLS)
   add_subdirectory(utf8cpp)
   add_subdirectory(valgrind)
   add_subdirectory(openssl)
-  add_subdirectory(jemalloc)
+  if(CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT NOJEM)
+    add_subdirectory(jemalloc)
+  endif()
   add_subdirectory(argon2)
   add_subdirectory(short_alloc)
 endif()

dep/PackageList.txt

@@ -18,15 +18,15 @@ efsw (Entropia File System Watcher - crossplatform file system watcher)
 
 fmt (a small, safe and fast formatting library)
   https://github.com/fmtlib/fmt
-  Version: 9.1.0 https://github.com/fmtlib/fmt/releases/tag/9.1.0
+  Version: 10.2.1 https://github.com/fmtlib/fmt/releases/tag/10.2.1
 
 G3D (a commercial-grade C++ 3D engine available as Open Source (BSD License)
   http://g3d.sourceforge.net/
   Version: 9.0-Release r4036
 
 jemalloc (a general-purpose scalable concurrent malloc-implementation)
-  http://www.canonware.com/jemalloc/
-  Version: 5.2.1
+  https://github.com/jemalloc/jemalloc
+  Version: 5.3.0
 
 libMPQ (a library for reading MPQ files)
   https://github.com/mbroemme/libmpq/

dep/fmt/include/fmt/args.h

@@ -1,4 +1,4 @@
-// Formatting library for C++ - dynamic format arguments
+// Formatting library for C++ - dynamic argument lists
 //
 // Copyright (c) 2012 - present, Victor Zverovich
 // All rights reserved.
@@ -22,8 +22,9 @@ template <typename T> struct is_reference_wrapper : std::false_type {};
 template <typename T>
 struct is_reference_wrapper<std::reference_wrapper<T>> : std::true_type {};
 
-template <typename T> const T& unwrap(const T& v) { return v; }
-template <typename T> const T& unwrap(const std::reference_wrapper<T>& v) {
+template <typename T> auto unwrap(const T& v) -> const T& { return v; }
+template <typename T>
+auto unwrap(const std::reference_wrapper<T>& v) -> const T& {
   return static_cast<const T&>(v);
 }
 
@@ -50,7 +51,7 @@ class dynamic_arg_list {
   std::unique_ptr<node<>> head_;
 
  public:
-  template <typename T, typename Arg> const T& push(const Arg& arg) {
+  template <typename T, typename Arg> auto push(const Arg& arg) -> const T& {
     auto new_node = std::unique_ptr<typed_node<T>>(new typed_node<T>(arg));
     auto& value = new_node->value;
     new_node->next = std::move(head_);
@@ -110,14 +111,14 @@ class dynamic_format_arg_store
 
   friend class basic_format_args<Context>;
 
-  unsigned long long get_types() const {
+  auto get_types() const -> unsigned long long {
     return detail::is_unpacked_bit | data_.size() |
            (named_info_.empty()
                 ? 0ULL
                 : static_cast<unsigned long long>(detail::has_named_args_bit));
   }
 
-  const basic_format_arg<Context>* data() const {
+  auto data() const -> const basic_format_arg<Context>* {
     return named_info_.empty() ? data_.data() : data_.data() + 1;
   }