From b3d60ec418ece5d01428e5d3f47339d2e3db24a8 Mon Sep 17 00:00:00 2001 From: nordsoft Date: Mon, 12 Dec 2022 04:46:42 +0400 Subject: [PATCH] Add new map sizes --- client/lobby/RandomMapTab.cpp | 2 +- lib/mapping/CMap.h | 3 +++ lib/mapping/CMapInfo.cpp | 12 ++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/client/lobby/RandomMapTab.cpp b/client/lobby/RandomMapTab.cpp index cf02dee30..ec8a3fcc2 100644 --- a/client/lobby/RandomMapTab.cpp +++ b/client/lobby/RandomMapTab.cpp @@ -245,5 +245,5 @@ void RandomMapTab::validateCompOnlyPlayersCnt(int compOnlyPlayersCnt) std::vector RandomMapTab::getPossibleMapSizes() { - return {CMapHeader::MAP_SIZE_SMALL, CMapHeader::MAP_SIZE_MIDDLE, CMapHeader::MAP_SIZE_LARGE, CMapHeader::MAP_SIZE_XLARGE}; + return {CMapHeader::MAP_SIZE_SMALL, CMapHeader::MAP_SIZE_MIDDLE, CMapHeader::MAP_SIZE_LARGE, CMapHeader::MAP_SIZE_XLARGE, CMapHeader::MAP_SIZE_HUGE, CMapHeader::MAP_SIZE_XHUGE, CMapHeader::MAP_SIZE_GIANT}; } diff --git a/lib/mapping/CMap.h b/lib/mapping/CMap.h index b8047624b..25c1a464b 100644 --- a/lib/mapping/CMap.h +++ b/lib/mapping/CMap.h @@ -284,6 +284,9 @@ public: static const int MAP_SIZE_MIDDLE = 72; static const int MAP_SIZE_LARGE = 108; static const int MAP_SIZE_XLARGE = 144; + static const int MAP_SIZE_HUGE = 180; + static const int MAP_SIZE_XHUGE = 216; + static const int MAP_SIZE_GIANT = 252; CMapHeader(); virtual ~CMapHeader(); diff --git a/lib/mapping/CMapInfo.cpp b/lib/mapping/CMapInfo.cpp index 3756ae580..f33f6a02e 100644 --- a/lib/mapping/CMapInfo.cpp +++ b/lib/mapping/CMapInfo.cpp @@ -134,6 +134,12 @@ int CMapInfo::getMapSizeIconId() const return 2; case CMapHeader::MAP_SIZE_XLARGE: return 3; + case CMapHeader::MAP_SIZE_HUGE: + return 4; + case CMapHeader::MAP_SIZE_XHUGE: + return 5; + case CMapHeader::MAP_SIZE_GIANT: + return 6; default: return 4; } @@ -180,6 +186,12 @@ std::string CMapInfo::getMapSizeName() const return "L"; case CMapHeader::MAP_SIZE_XLARGE: return "XL"; + case CMapHeader::MAP_SIZE_HUGE: + return "H"; + case CMapHeader::MAP_SIZE_XHUGE: + return "XH"; + case CMapHeader::MAP_SIZE_GIANT: + return "G"; default: return "C"; }