diff options
| -rw-r--r-- | src/tools/mmaps_generator/MapBuilder.cpp | 42 | ||||
| -rw-r--r-- | src/tools/mmaps_generator/PathCommon.h | 14 | ||||
| -rw-r--r-- | src/tools/mmaps_generator/TerrainBuilder.cpp | 5 |
3 files changed, 14 insertions, 47 deletions
diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp index 9aa8f86d7a3..200c0b85917 100644 --- a/src/tools/mmaps_generator/MapBuilder.cpp +++ b/src/tools/mmaps_generator/MapBuilder.cpp @@ -16,39 +16,19 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "PathCommon.h" #include "MapBuilder.h" -#include "MapTree.h" -#include "DetourNavMeshBuilder.h" -#include "DetourNavMesh.h" #include "IntermediateValues.h" - -#include <limits.h> - -#define MMAP_MAGIC 0x4d4d4150 // 'MMAP' -#define MMAP_VERSION 8 - -struct MmapTileHeader -{ - uint32 mmapMagic; - uint32 dtVersion; - uint32 mmapVersion; - uint32 size; - char usesLiquids; - char padding[3]; - - MmapTileHeader() : mmapMagic(MMAP_MAGIC), dtVersion(DT_NAVMESH_VERSION), - mmapVersion(MMAP_VERSION), size(0), usesLiquids(true), padding() {} -}; - -// All padding fields must be handled and initialized to ensure mmaps_generator will produce binary-identical *.mmtile files -static_assert(sizeof(MmapTileHeader) == 20, "MmapTileHeader size is not correct, adjust the padding field size"); -static_assert(sizeof(MmapTileHeader) == (sizeof(MmapTileHeader::mmapMagic) + - sizeof(MmapTileHeader::dtVersion) + - sizeof(MmapTileHeader::mmapVersion) + - sizeof(MmapTileHeader::size) + - sizeof(MmapTileHeader::usesLiquids) + - sizeof(MmapTileHeader::padding)), "MmapTileHeader has uninitialized padding fields"); +#include "MapDefines.h" +#include "MapTree.h" +#include "ModelInstance.h" +#include "PathCommon.h" +#include "StringFormat.h" +#include "VMapFactory.h" +#include "VMapManager2.h" +#include <DetourCommon.h> +#include <DetourNavMesh.h> +#include <DetourNavMeshBuilder.h> +#include <climits> namespace MMAP { diff --git a/src/tools/mmaps_generator/PathCommon.h b/src/tools/mmaps_generator/PathCommon.h index 6996a5a47eb..26fa84c789c 100644 --- a/src/tools/mmaps_generator/PathCommon.h +++ b/src/tools/mmaps_generator/PathCommon.h @@ -34,20 +34,6 @@ #include <cerrno> #endif -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 -}; - namespace MMAP { inline bool matchWildcardFilter(char const* filter, char const* str) diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp index 38b3c3ca447..d86cf2738d2 100644 --- a/src/tools/mmaps_generator/TerrainBuilder.cpp +++ b/src/tools/mmaps_generator/TerrainBuilder.cpp @@ -19,10 +19,11 @@ #include "TerrainBuilder.h" #include "MapBuilder.h" - -#include "VMapManager2.h" +#include "MapDefines.h" #include "MapTree.h" #include "ModelInstance.h" +#include "VMapFactory.h" +#include "VMapManager2.h" #include <map> // ****************************************** |