diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/Collision/Management/MMapManager.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_mmaps.cpp | 2 | ||||
| -rw-r--r-- | src/tools/mmaps_generator/IntermediateValues.cpp | 8 | ||||
| -rw-r--r-- | src/tools/mmaps_generator/MapBuilder.cpp | 4 | ||||
| -rw-r--r-- | src/tools/vmap4_extractor/vmapexport.cpp | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/common/Collision/Management/MMapManager.cpp b/src/common/Collision/Management/MMapManager.cpp index 2f417e9b0b1..3e57c095eb1 100644 --- a/src/common/Collision/Management/MMapManager.cpp +++ b/src/common/Collision/Management/MMapManager.cpp @@ -338,7 +338,7 @@ namespace MMAP { mmap->loadedTileRefs.erase(packedGridPos); --loadedTiles; - TC_LOG_DEBUG("maps", "MMAP:unloadMap: Unloaded mmtile %03i[%02i, %02i] from %04i", mapId, x, y, mapId); + TC_LOG_DEBUG("maps", "MMAP:unloadMap: Unloaded mmtile %04i[%02i, %02i] from %04i", mapId, x, y, mapId); PhaseChildMapContainer::const_iterator phasedMaps = phaseMapData.find(mapId); if (phasedMaps != phaseMapData.end()) diff --git a/src/server/scripts/Commands/cs_mmaps.cpp b/src/server/scripts/Commands/cs_mmaps.cpp index 8c055a4742c..f478cc6aa5e 100644 --- a/src/server/scripts/Commands/cs_mmaps.cpp +++ b/src/server/scripts/Commands/cs_mmaps.cpp @@ -130,7 +130,7 @@ public: int32 gx = 32 - player->GetPositionX() / SIZE_OF_GRIDS; int32 gy = 32 - player->GetPositionY() / SIZE_OF_GRIDS; - handler->PSendSysMessage("%03u%02i%02i.mmtile", player->GetMapId(), gx, gy); + handler->PSendSysMessage("%04u%02i%02i.mmtile", player->GetMapId(), gx, gy); handler->PSendSysMessage("gridloc [%i, %i]", gy, gx); // calculate navmesh tile location diff --git a/src/tools/mmaps_generator/IntermediateValues.cpp b/src/tools/mmaps_generator/IntermediateValues.cpp index 6a802ff1059..34668ba03b0 100644 --- a/src/tools/mmaps_generator/IntermediateValues.cpp +++ b/src/tools/mmaps_generator/IntermediateValues.cpp @@ -37,7 +37,7 @@ namespace MMAP printf("%sWriting debug output... \r", tileString); - std::string name("meshes/%03u%02i%02i."); + std::string name("meshes/%04u%02i%02i."); #define DEBUG_WRITE(fileExtension,data) \ do { \ @@ -202,7 +202,7 @@ namespace MMAP 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); + sprintf(objFileName, "meshes/map%04u%02u%02u.obj", mapID, tileY, tileX); FILE* objFile = fopen(objFileName, "wb"); if (!objFile) @@ -239,7 +239,7 @@ namespace MMAP sprintf(tileString, "[%02u,%02u]: ", tileY, tileX); printf("%sWriting debug output... \r", tileString); - sprintf(objFileName, "meshes/%03u.map", mapID); + sprintf(objFileName, "meshes/%04u.map", mapID); objFile = fopen(objFileName, "wb"); if (!objFile) @@ -254,7 +254,7 @@ namespace MMAP fwrite(&b, sizeof(char), 1, objFile); fclose(objFile); - sprintf(objFileName, "meshes/%03u%02u%02u.mesh", mapID, tileY, tileX); + sprintf(objFileName, "meshes/%04u%02u%02u.mesh", mapID, tileY, tileX); objFile = fopen(objFileName, "wb"); if (!objFile) { diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp index b721162bfe2..4da48ab0a5a 100644 --- a/src/tools/mmaps_generator/MapBuilder.cpp +++ b/src/tools/mmaps_generator/MapBuilder.cpp @@ -130,7 +130,7 @@ namespace MMAP mapID = (*itr).m_mapId; files.clear(); - getDirContents(files, "vmaps", Trinity::StringFormat("%04u*.vmtile", mapID)); + getDirContents(files, "vmaps", Trinity::StringFormat("%04u_*.vmtile", mapID)); for (uint32 i = 0; i < files.size(); ++i) { tileX = uint32(atoi(files[i].substr(8, 2).c_str())); @@ -375,7 +375,7 @@ namespace MMAP void MapBuilder::buildMap(uint32 mapID) { #ifndef __APPLE__ - //printf("[Thread %u] Building map %03u:\n", uint32(ACE_Thread::self()), mapID); + //printf("[Thread %u] Building map %04u:\n", uint32(ACE_Thread::self()), mapID); #endif std::set<uint32>* tiles = getTileList(mapID); diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp index ce9bb6453ca..422aeb2e61c 100644 --- a/src/tools/vmap4_extractor/vmapexport.cpp +++ b/src/tools/vmap4_extractor/vmapexport.cpp @@ -322,7 +322,7 @@ void ParsMapFiles() { if (ADTFile *ADT = WDT.GetMap(x,y)) { - //sprintf(id_filename,"%02u %02u %03u",x,y,map_ids[i].id);//!!!!!!!!! + //sprintf(id_filename,"%02u %02u %04u",x,y,map_ids[i].id);//!!!!!!!!! ADT->init(map_ids[i].id, x, y); delete ADT; } |