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

Remove most of non-const access to VLC entities

Browse Source
This commit is contained in:
Ivan Savenko
2023-12-31 23:43:35 +02:00
parent bd5682ecc3
commit d5c4478816
55 changed files with 236 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/CArtHandler.cpp
View File

@@ -49,12 +49,12 @@ bool CCombinedArtifact::isCombined() const
return !(constituents.empty());
}
const std::vector<CArtifact*> & CCombinedArtifact::getConstituents() const
const std::vector<const CArtifact*> & CCombinedArtifact::getConstituents() const
{
return constituents;
}
const std::vector<CArtifact*> & CCombinedArtifact::getPartOf() const
const std::vector<const CArtifact*> & CCombinedArtifact::getPartOf() const
{
return partOf;
}
@@ -597,7 +597,7 @@ void CArtHandler::loadComponents(CArtifact * art, const JsonNode & node)
{
// when this code is called both combinational art as well as component are loaded
// so it is safe to access any of them
art->constituents.push_back(objects[id]);
art->constituents.push_back(ArtifactID(id).toArtifact());
objects[id]->partOf.push_back(art);
});
}