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 pull request #4964 from vcmi/connections_rework

Browse Source 
Connections rework
This commit is contained in:
Ivan Savenko
2024-12-02 13:21:32 +02:00
committed by GitHub
parent 306ee95496 e5b151991b
commit fcb4dfa985
3 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/rmg/CRmgTemplate.h
View File

@@ -97,6 +97,8 @@ public:
ZoneConnection();
int getId() const;
void setId(int id);
TRmgTemplateZoneId getZoneA() const;
TRmgTemplateZoneId getZoneB() const;
TRmgTemplateZoneId getOtherZoneId(TRmgTemplateZoneId id) const;
@@ -108,6 +110,7 @@ public:
friend bool operator==(const ZoneConnection &, const ZoneConnection &);
private:
int id;
TRmgTemplateZoneId zoneA;
TRmgTemplateZoneId zoneB;
int guardStrength;
@@ -294,7 +297,7 @@ private:
CPlayerCountRange players;
CPlayerCountRange humanPlayers;
Zones zones;
std::vector<rmg::ZoneConnection> connectedZoneIds;
std::vector<rmg::ZoneConnection> connections;
std::set<EWaterContent::EWaterContent> allowedWaterContent;
std::unique_ptr<JsonNode> mapSettings;