summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/tools/mmaps_generator/MapBuilder.cpp26
-rw-r--r--src/tools/mmaps_generator/MapBuilder.h1
2 files changed, 17 insertions, 10 deletions
diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp
index 16e57a6e98..ece132630d 100644
--- a/src/tools/mmaps_generator/MapBuilder.cpp
+++ b/src/tools/mmaps_generator/MapBuilder.cpp
@@ -942,16 +942,8 @@ namespace MMAP
return static_cast<uint32>(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 e36e1117fb..475469bf81 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;