games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

Merge branch 'rmg-split-enum-monster-strength' into rmg-no-monster-zone

Browse Source
This commit is contained in:
Warzyw647
2023-05-20 17:29:07 +02:00
parent 149ae9986c 5363fd5db3
commit 7afcc3b350
5 changed files with 34 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/rmg/CRmgTemplate.h
View File

@@ -18,21 +18,18 @@ VCMI_LIB_NAMESPACE_BEGIN
class JsonSerializeFormat;
namespace ETemplateZoneType
enum class ETemplateZoneType
{
enum ETemplateZoneType
{
PLAYER_START,
CPU_START,
TREASURE,
JUNCTION,
WATER
};
}
PLAYER_START,
CPU_START,
TREASURE,
JUNCTION,
WATER
};
namespace EWaterContent
{
enum EWaterContent
namespace EWaterContent // Not enum class, because it's used in method RandomMapTab::setMapGenOptions
{ // defined in client\lobby\RandomMapTab.cpp and probably in other similar places
enum EWaterContent // as an argument of CToggleGroup::setSelected(int id) from \client\widgets\Buttons.cpp
{
RANDOM = -1,
NONE,
@@ -120,8 +117,8 @@ public:
TRmgTemplateZoneId getId() const;
void setId(TRmgTemplateZoneId value);
ETemplateZoneType::ETemplateZoneType getType() const;
void setType(ETemplateZoneType::ETemplateZoneType value);
ETemplateZoneType getType() const;
void setType(ETemplateZoneType value);
int getSize() const;
void setSize(int value);
@@ -164,7 +161,7 @@ public:
protected:
TRmgTemplateZoneId id;
ETemplateZoneType::ETemplateZoneType type;
ETemplateZoneType type;
int size;
ui32 maxTreasureValue;
std::optional<int> owner;