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

Fix connections not getting actually updated

Browse Source
This commit is contained in:
Tomasz Zieliński
2025-03-14 14:37:33 +01:00
parent f0971dfdd6
commit 11ecb05bca
5 changed files with 155 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/rmg/CRmgTemplate.cpp
View File

@@ -302,6 +302,28 @@ std::vector<ZoneConnection> ZoneOptions::getConnections() const
return connectionDetails;
}
std::vector<ZoneConnection>& ZoneOptions::getConnectionsRef()
{
return connectionDetails;
}
void ZoneOptions::setRoadOption(int connectionId, rmg::ERoadOption roadOption)
{
for(auto & connection : connectionDetails)
{
if(connection.getId() == connectionId)
{
connection.setRoadOption(roadOption);
logGlobal->info("Set road option for connection %d between zones %d and %d to %s",
connectionId, connection.getZoneA(), connection.getZoneB(),
roadOption == rmg::ERoadOption::ROAD_TRUE ? "true" :
roadOption == rmg::ERoadOption::ROAD_FALSE ? "false" : "random");
return;
}
}
logGlobal->warn("Failed to find connection with ID %d in zone %d", connectionId, id);
}
std::vector<TRmgTemplateZoneId> ZoneOptions::getConnectedZoneIds() const
{
return connectedZoneIds;
@@ -481,12 +503,22 @@ rmg::ERoadOption ZoneConnection::getRoadOption() const
{
return hasRoad;
}
void ZoneConnection::setRoadOption(rmg::ERoadOption roadOption)
{
hasRoad = roadOption;
}
bool operator==(const ZoneConnection & l, const ZoneConnection & r)
{
return l.id == r.id;
}
bool operator<(const ZoneConnection & l, const ZoneConnection & r)
{
return l.id < r.id;
}
void ZoneConnection::serializeJson(JsonSerializeFormat & handler)
{
static const std::vector<std::string> connectionTypes =