aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuarte Duarte <dnpd.dd@gmail.com>2015-05-16 23:43:08 +0100
committerDuarte Duarte <dnpd.dd@gmail.com>2015-05-16 23:43:08 +0100
commit051e3b631db74886479c58485fad46b9a326a966 (patch)
treef729c5471ddf7b49dd91f674de3bdcc55748d901
parent2678c52b1fb893a3bec92a0c1caaf167cc1554f1 (diff)
parent45070e0bafe7fc336d3bdcc4da1b3c1a27950eb5 (diff)
Merge pull request #14702 from Zedron/6.x
Tools/MMaps: Fixed loading .map files
-rw-r--r--src/tools/mmaps_generator/TerrainBuilder.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp
index 8f85cfdbe83..125f630bb13 100644
--- a/src/tools/mmaps_generator/TerrainBuilder.cpp
+++ b/src/tools/mmaps_generator/TerrainBuilder.cpp
@@ -80,7 +80,7 @@ struct map_liquidHeader
namespace MMAP
{
- char const* MAP_VERSION_MAGIC = "v1.4";
+ char const* MAP_VERSION_MAGIC = "v1.5";
TerrainBuilder::TerrainBuilder(bool skipLiquid) : m_skipLiquid (skipLiquid){ }
TerrainBuilder::~TerrainBuilder() { }
@@ -134,7 +134,7 @@ namespace MMAP
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);
+ sprintf(mapFileName, "maps/%04u_%02u_%02u.map", mapID, tileY, tileX);
FILE* mapFile = fopen(mapFileName, "rb");
if (!mapFile)