Merge branch 'master' into Playerbot

src/common/Collision/DynamicTree.cpp

@@ -40,7 +40,7 @@ namespace
 
 template<> struct HashTrait< GameObjectModel>
 {
-    static size_t hashCode(const GameObjectModel& g) { return (size_t)(void*)&g; }
+    static std::size_t hashCode(const GameObjectModel& g) { return (size_t)(void*)&g; }
 };
 
 template<> struct PositionTrait< GameObjectModel>

src/common/Collision/Management/IMMAPMgr.h

@@ -18,9 +18,6 @@
 #ifndef _IMMAPMANAGER_H
 #define _IMMAPMANAGER_H
 
-#include "Define.h"
-#include <string>
-
 // Interface for IMMapManger
 namespace MMAP
 {

src/common/Collision/Management/MMapFactory.cpp

@@ -17,8 +17,6 @@
 
 #include "MMapFactory.h"
 #include <cstring>
-#include <set>
-
 namespace MMAP
 {
     // ######################## MMapFactory ########################

src/common/Collision/Management/MMapFactory.h

@@ -18,11 +18,7 @@
 #ifndef _MMAP_FACTORY_H
 #define _MMAP_FACTORY_H
 
-#include "DetourAlloc.h"
-#include "DetourExtended.h"
-#include "DetourNavMesh.h"
 #include "MMapMgr.h"
-#include <unordered_map>
 
 namespace MMAP
 {

src/common/Collision/Management/MMapMgr.cpp

@@ -175,7 +175,7 @@ namespace MMAP
         unsigned char* data = (unsigned char*)dtAlloc(fileHeader.size, DT_ALLOC_PERM);
         ASSERT(data);
 
-        size_t result = fread(data, fileHeader.size, 1, file);
+        std::size_t result = fread(data, fileHeader.size, 1, file);
         if (!result)
         {
             LOG_ERROR("maps", "MMAP:loadMap: Bad header or data in mmap {:03}{:02}{:02}.mmtile", mapId, x, y);

src/common/Collision/Management/MMapMgr.h

@@ -22,12 +22,11 @@
 #include "DetourAlloc.h"
 #include "DetourExtended.h"
 #include "DetourNavMesh.h"
-#include <shared_mutex>
 #include <unordered_map>
 #include <vector>
 
 //  memory management
-inline void* dtCustomAlloc(size_t size, dtAllocHint /*hint*/)
+inline void* dtCustomAlloc(std::size_t size, dtAllocHint /*hint*/)
 {
     return (void*)new unsigned char[size];
 }

src/common/Collision/Management/VMapFactory.h

@@ -18,8 +18,6 @@
 #ifndef _VMAPFACTORY_H
 #define _VMAPFACTORY_H
 
-#include "IVMapMgr.h"
-
 // This is the access point to the VMapMgr.
 namespace VMAP
 {

src/common/Collision/Management/VMapMgr2.h

@@ -18,7 +18,6 @@
 #ifndef _VMAPMANAGER2_H
 #define _VMAPMANAGER2_H
 
-#include "Common.h"
 #include "IVMapMgr.h"
 #include <mutex>
 #include <unordered_map>

src/common/Collision/Models/WorldModel.h

@@ -21,7 +21,6 @@
 #include "BoundingIntervalHierarchy.h"
 #include "Define.h"
 #include <G3D/AABox.h>
-#include <G3D/HashTrait.h>
 #include <G3D/Ray.h>
 #include <G3D/Vector3.h>
 

src/common/Collision/RegularGrid.h

@@ -1,7 +1,6 @@
 #ifndef _REGULAR_GRID_H
 #define _REGULAR_GRID_H
 
-#include <G3D/BoundsTrait.h>
 #include <G3D/PositionTrait.h>
 #include <G3D/Ray.h>
 #include <G3D/Table.h>

src/common/Collision/VMapDefinitions.h

@@ -17,7 +17,6 @@
 
 #ifndef _VMAPDEFINITIONS_H
 #define _VMAPDEFINITIONS_H
-#include <cstring>
 
 #define LIQUID_TILE_SIZE (533.333f / 128.f)
 

src/common/Collision/VMapTools.h

@@ -18,7 +18,6 @@
 #ifndef _VMAPTOOLS_H
 #define _VMAPTOOLS_H
 
-#include "Define.h"
 #include <G3D/AABox.h>
 #include <G3D/CollisionDetection.h>