From 5474b00a3d4f75245068535c26fa44c70f7ca6b4 Mon Sep 17 00:00:00 2001 From: IntelligentQuantum Date: Sat, 14 May 2022 15:11:34 +0430 Subject: [PATCH] feat(tools/mmaps): isContinentMap (#11727) * . * . --- src/tools/mmaps_generator/MapBuilder.cpp | 26 +++++++++++++++--------- src/tools/mmaps_generator/MapBuilder.h | 1 + 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp index 16e57a6e9..ece132630 100644 --- a/src/tools/mmaps_generator/MapBuilder.cpp +++ b/src/tools/mmaps_generator/MapBuilder.cpp @@ -942,16 +942,8 @@ namespace MMAP return static_cast(m_mapid) != mapID; if (m_skipContinents) - switch (mapID) - { - case 0: - case 1: - case 530: - case 571: - return true; - default: - break; - } + if (isContinentMap(mapID)) + return true; if (m_skipJunkMaps) switch (mapID) @@ -1031,6 +1023,20 @@ namespace MMAP } } + bool MapBuilder::isContinentMap(uint32 mapID) const + { + switch (mapID) + { + case 0: + case 1: + case 530: + case 571: + return true; + default: + return false; + } + } + /**************************************************************************/ bool TileBuilder::shouldSkipTile(uint32 mapID, uint32 tileX, uint32 tileY) const { diff --git a/src/tools/mmaps_generator/MapBuilder.h b/src/tools/mmaps_generator/MapBuilder.h index e36e1117f..475469bf8 100644 --- a/src/tools/mmaps_generator/MapBuilder.h +++ b/src/tools/mmaps_generator/MapBuilder.h @@ -185,6 +185,7 @@ namespace MMAP bool shouldSkipMap(uint32 mapID) const; bool isTransportMap(uint32 mapID) const; + bool isContinentMap(uint32 mapID) const; rcConfig GetMapSpecificConfig(uint32 mapID, float bmin[3], float bmax[3], const TileConfig &tileConfig) const;