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

Reorganize namespaces

Browse Source
This commit is contained in:
Tomasz Zieliński
2023-07-07 16:32:17 +02:00
parent 8463fe200c
commit 3889193a48
4 changed files with 34 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lib/rmg/CRmgTemplate.h
View File

@@ -67,30 +67,24 @@ public:
void serializeJson(JsonSerializeFormat & handler);
};
namespace EConnectionType
{
enum class EConnectionType
{
GUARDED = 0, //default
FICTIVE,
REPULSIVE,
WIDE
};
}
namespace ERoadOption
{
enum class ERoadOption
{
ROAD_TRUE,
ROAD_FALSE,
ROAD_RANDOM
};
}
namespace rmg
{
enum class EConnectionType
{
GUARDED = 0, //default
FICTIVE,
REPULSIVE,
WIDE
};
enum class ERoadOption
{
ROAD_TRUE,
ROAD_FALSE,
ROAD_RANDOM
};
class DLL_LINKAGE ZoneConnection
{
public:
@@ -101,8 +95,8 @@ public:
TRmgTemplateZoneId getZoneB() const;
TRmgTemplateZoneId getOtherZoneId(TRmgTemplateZoneId id) const;
int getGuardStrength() const;
EConnectionType::EConnectionType getConnectionType() const;
ERoadOption::ERoadOption getRoadOption() const;
rmg::EConnectionType getConnectionType() const;
rmg::ERoadOption getRoadOption() const;
void serializeJson(JsonSerializeFormat & handler);
@@ -111,8 +105,8 @@ private:
TRmgTemplateZoneId zoneA;
TRmgTemplateZoneId zoneB;
int guardStrength;
EConnectionType::EConnectionType connectionType;
ERoadOption::ERoadOption hasRoad;
rmg::EConnectionType connectionType;
rmg::ERoadOption hasRoad;
};
class DLL_LINKAGE ZoneOptions