Skip to content

Increase GameData version #1905

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Flow86 merged 2 commits into from
Mar 15, 2026
+37 −33
Merged

Increase GameData version #1905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
617e853
Increase GameData version
Flamefire Mar 15, 2026
cc216ff
Rename `harbor_pos` to `harborData`
Flamefire Mar 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libs/s25main/SerializedGameData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@
/// 10: troop_limits state introduced to military buildings
/// 11: wineaddon added, three new building types and two new goods
/// 12: leatheraddon added, three new building types and three new goods
/// 13: SeaId & HarborId: World::harbor_pos w/o dummy entry at 0
static const unsigned currentGameDataVersion = 12;
/// 13: SeaId & HarborId: World::harborData w/o dummy entry at 0
static const unsigned currentGameDataVersion = 13;
// clang-format on

std::unique_ptr<GameObject> SerializedGameData::Create_GameObject(const GO_Type got, const unsigned obj_id)
Expand Down
28 changes: 14 additions & 14 deletions libs/s25main/world/MapLoader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ bool MapLoader::InitNodes(const libsiedler2::ArchivItem_Map& map, Exploration ex

// Hafenplatz?
if((t1 & libsiedler2::HARBOR_MASK) != 0)
world_.harbor_pos.push_back(HarborPos(pt));
world_.harborData.push_back(HarborPos(pt));

// Will be set later
node.harborId.reset();
Expand Down Expand Up @@ -423,7 +423,7 @@ bool MapLoader::PlaceHQs(GameWorldBase& world, std::vector<MapPoint> hqPositions
bool MapLoader::InitSeasAndHarbors(World& world, const std::vector<MapPoint>& additionalHarbors)
{
for(MapPoint pt : additionalHarbors)
world.harbor_pos.push_back(HarborPos(pt));
world.harborData.push_back(HarborPos(pt));
// Clear current harbors and seas
RTTR_FOREACH_PT(MapPoint, world.GetSize()) //-V807
{
Expand All @@ -448,7 +448,7 @@ bool MapLoader::InitSeasAndHarbors(World& world, const std::vector<MapPoint>& ad

/// Determine seas adjacent to the harbor places
HarborId curHarborId(1);
for(auto it = world.harbor_pos.begin(); it != world.harbor_pos.end();)
for(auto it = world.harborData.begin(); it != world.harborData.end();)
{
helpers::StrongIdVector<bool, SeaId> hasCoastAtSea(world.seas.size(), false);
bool foundCoast = false;
Expand All @@ -474,7 +474,7 @@ bool MapLoader::InitSeasAndHarbors(World& world, const std::vector<MapPoint>& ad
if(!foundCoast)
{
LOG.write("Map Bug: Found harbor without coast at %1%. Removing!\n") % it->pos;
it = world.harbor_pos.erase(it);
it = world.harborData.erase(it);
} else
{
world.GetNodeInt(it->pos).harborId = curHarborId;
Expand All @@ -487,9 +487,9 @@ bool MapLoader::InitSeasAndHarbors(World& world, const std::vector<MapPoint>& ad
CalcHarborPosNeighbors(world);

// Validate
for(const auto startHbId : helpers::idRange<HarborId>(world.harbor_pos.size()))
for(const auto startHbId : helpers::idRange<HarborId>(world.harborData.size()))
{
const HarborPos& startHbPos = world.harbor_pos[startHbId];
const HarborPos& startHbPos = world.harborData[startHbId];
for(const std::vector<HarborPos::Neighbor>& neighbors : startHbPos.neighbors)
{
for(const HarborPos::Neighbor& neighbor : neighbors)
Expand Down Expand Up @@ -519,7 +519,7 @@ struct CalcHarborPosNeighborsNode
/// Calculate the distance from each harbor to the others
void MapLoader::CalcHarborPosNeighbors(World& world)
{
for(HarborPos& harbor : world.harbor_pos)
for(HarborPos& harbor : world.harborData)
{
for(const auto dir : helpers::EnumRange<ShipDirection>{})
harbor.neighbors[dir].clear();
Expand All @@ -538,7 +538,7 @@ void MapLoader::CalcHarborPosNeighbors(World& world)
// FIFO queue used for a BFS
std::queue<CalcHarborPosNeighborsNode> todo_list;

for(const auto startHbId : helpers::idRange<HarborId>(world.harbor_pos.size()))
for(const auto startHbId : helpers::idRange<HarborId>(world.harborData.size()))
{
RTTR_Assert(todo_list.empty());

Expand All @@ -548,13 +548,13 @@ void MapLoader::CalcHarborPosNeighbors(World& world)
// 1 - Coast to a harbor
std::vector<int8_t> ptToVisitOrHb(ptIsSeaPt);

helpers::StrongIdVector<bool, HarborId> hbFound(world.harbor_pos.size(), false);
helpers::StrongIdVector<bool, HarborId> hbFound(world.harborData.size(), false);
// For each sea, store the coastal point indices and their harbor
helpers::StrongIdVector<std::multimap<unsigned, HarborId>, SeaId> coastToHarborPerSea(world.seas.size());
std::vector<MapPoint> ownCoastalPoints;

// mark coastal points around harbors
for(const auto otherHbId : helpers::idRange<HarborId>(world.harbor_pos.size()))
for(const auto otherHbId : helpers::idRange<HarborId>(world.harborData.size()))
{
for(const auto dir : helpers::EnumRange<Direction>{})
{
Expand Down Expand Up @@ -586,7 +586,7 @@ void MapLoader::CalcHarborPosNeighbors(World& world)
for(auto it = coastToHbs.first; it != coastToHbs.second; ++it)
{
ShipDirection shipDir = world.GetShipDir(ownCoastPt, ownCoastPt);
world.harbor_pos[startHbId].neighbors[shipDir].push_back(HarborPos::Neighbor(it->second, 0));
world.harborData[startHbId].neighbors[shipDir].push_back(HarborPos::Neighbor(it->second, 0));
hbFound[it->second] = true;
}
todo_list.push(CalcHarborPosNeighborsNode(ownCoastPt, 0));
Expand All @@ -612,7 +612,7 @@ void MapLoader::CalcHarborPosNeighbors(World& world)

if(ptValue > 0) // found harbor(s)
{
ShipDirection shipDir = world.GetShipDir(world.harbor_pos[startHbId].pos, curPt);
ShipDirection shipDir = world.GetShipDir(world.harborData[startHbId].pos, curPt);
SeaId seaId = world.GetSeaFromCoastalPoint(curPt);
auto const coastToHbs = coastToHarborPerSea[seaId].equal_range(idx);
for(auto it = coastToHbs.first; it != coastToHbs.second; ++it)
Expand All @@ -622,11 +622,11 @@ void MapLoader::CalcHarborPosNeighbors(World& world)
continue;

hbFound[otherHbId] = true;
world.harbor_pos[startHbId].neighbors[shipDir].push_back(
world.harborData[startHbId].neighbors[shipDir].push_back(
HarborPos::Neighbor(otherHbId, curNode.distance + 1));

// Make this the only coastal point of this harbor for this sea
HarborPos& otherHb = world.harbor_pos[otherHbId];
HarborPos& otherHb = world.harborData[otherHbId];
RTTR_Assert(seaId);
for(const auto hbDir : helpers::EnumRange<Direction>{})
{
Expand Down
20 changes: 12 additions & 8 deletions libs/s25main/world/MapSerializer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ void MapSerializer::Serialize(const GameWorldBase& world, SerializedGameData& sg
sgd.PushUnsignedInt(sea.nodes_count);
}
// Hafenpositionen serialisieren
sgd.PushUnsignedInt(world.harbor_pos.size());
for(const auto& curHarborPos : world.harbor_pos)
sgd.PushUnsignedInt(world.harborData.size());
for(const auto& curHarborPos : world.harborData)
{
helpers::pushPoint(sgd, curHarborPos.pos);
helpers::pushContainer(sgd, curHarborPos.seaIds);
Expand Down Expand Up @@ -131,13 +131,13 @@ void MapSerializer::Deserialize(GameWorldBase& world, SerializedGameData& sgd, G

// Deserialize harbor data
const unsigned numHarborPositions = sgd.PopUnsignedInt();
world.harbor_pos.clear();
world.harbor_pos.reserve(numHarborPositions);
world.harborData.clear();
world.harborData.reserve(numHarborPositions);
for(const auto i : helpers::range<unsigned>(numHarborPositions))
{
RTTR_UNUSED(i);
world.harbor_pos.emplace_back(sgd.PopMapPoint());
auto& curHarborPos = world.harbor_pos.back();
world.harborData.emplace_back(sgd.PopMapPoint());
auto& curHarborPos = world.harborData.back();
helpers::popContainer(sgd, curHarborPos.seaIds);
for(auto& neighbor : curHarborPos.neighbors)
{
Expand All @@ -152,8 +152,12 @@ void MapSerializer::Deserialize(GameWorldBase& world, SerializedGameData& sgd, G
}
}
}
if(sgd.GetGameDataVersion() < 13 && !world.harbor_pos.empty())
world.harbor_pos.erase(world.harbor_pos.begin());
if(sgd.GetGameDataVersion() < 13 && !world.harborData.empty())
{
// Workaround for save games without increased game data version after introducing the change
if(!world.harborData.front().pos.isValid())
world.harborData.erase(world.harborData.begin());
}

sgd.PopObjectContainer(world.harbor_building_sites_from_sea, GO_Type::Buildingsite);

Expand Down
14 changes: 7 additions & 7 deletions libs/s25main/world/World.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ void World::Unload()
node.figures.clear();

catapult_stones.clear();
harbor_pos.clear();
harborData.clear();
description_ = WorldDescription();
noNodeObj.reset();
Resize(MapExtent::all(0));
Expand Down Expand Up @@ -345,7 +345,7 @@ unsigned World::GetSeaSize(const SeaId seaId) const
SeaId World::GetSeaId(const HarborId harborId, const Direction dir) const
{
RTTR_Assert(harborId);
return harbor_pos[harborId].seaIds[dir];
return harborData[harborId].seaIds[dir];
}

bool World::IsHarborAtSea(const HarborId harborId, const SeaId seaId) const
Expand All @@ -361,8 +361,8 @@ MapPoint World::GetCoastalPoint(const HarborId harborId, const SeaId seaId) cons
// Take point at NW last as often there is no path from it if the harbor is north of an island
for(auto dir : helpers::enumRange(Direction::NorthEast))
{
if(harbor_pos[harborId].seaIds[dir] == seaId)
return GetNeighbour(harbor_pos[harborId].pos, dir);
if(harborData[harborId].seaIds[dir] == seaId)
return GetNeighbour(harborData[harborId].pos, dir);
}

// Keinen Punkt gefunden
Expand Down Expand Up @@ -402,14 +402,14 @@ MapPoint World::GetHarborPoint(const HarborId harborId) const
{
RTTR_Assert(harborId);

return harbor_pos[harborId].pos;
return harborData[harborId].pos;
}

const std::vector<HarborPos::Neighbor>& World::GetHarborNeighbors(const HarborId harborId,
const ShipDirection& dir) const
{
RTTR_Assert(harborId);
return harbor_pos[harborId].neighbors[dir];
return harborData[harborId].neighbors[dir];
}

unsigned World::CalcHarborDistance(HarborId haborId1, HarborId harborId2) const
Expand All @@ -418,7 +418,7 @@ unsigned World::CalcHarborDistance(HarborId haborId1, HarborId harborId2) const
return 0;
for(const auto dir : helpers::EnumRange<ShipDirection>{})
{
for(const HarborPos::Neighbor& n : harbor_pos[haborId1].neighbors[dir])
for(const HarborPos::Neighbor& n : harborData[haborId1].neighbors[dir])
{
if(n.id == harborId2)
return n.distance;
Expand Down
4 changes: 2 additions & 2 deletions libs/s25main/world/World.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class World : public MapBase
helpers::StrongIdVector<Sea, SeaId> seas;

/// Alle Hafenpositionen
helpers::StrongIdVector<HarborPos, HarborId> harbor_pos;
helpers::StrongIdVector<HarborPos, HarborId> harborData;

WorldDescription description_;

Expand Down Expand Up @@ -186,7 +186,7 @@ class World : public MapBase
/// Return the coast pt for a given harbor (where ships can land) if any
MapPoint GetCoastalPoint(HarborId harborId, SeaId seaId) const;
/// Return the number of harbor points
unsigned GetNumHarborPoints() const { return harbor_pos.size(); }
unsigned GetNumHarborPoints() const { return harborData.size(); }
/// Return the coordinates for a given harbor point
MapPoint GetHarborPoint(HarborId harborId) const;
/// Return the ID of the harbor point on that node or 0 if there is none
Expand Down
Loading