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

Restore save compatibility with 1.6

Browse Source
This commit is contained in:
Ivan Savenko
2025-04-16 17:05:52 +03:00
parent 77845f74bc
commit a43c3fcb31
27 changed files with 429 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/mapObjects/MiscObjects.h
View File

@@ -119,7 +119,18 @@ public:
{
h & static_cast<CArmedInstance&>(*this);
h & message;
h & storedArtifact;
if (h.saving || h.hasFeature(Handler::Version::NO_RAW_POINTERS_IN_SERIALIZER))
{
h & storedArtifact;
}
else
{
std::shared_ptr<CArtifactInstance> pointer;
h & pointer;
if (pointer->getId() == ArtifactInstanceID())
CArtifactInstance::saveCompatibilityFixArtifactID(pointer);
storedArtifact = pointer->getId();
}
}
protected:
void serializeJsonOptions(JsonSerializeFormat & handler) override;
@@ -312,7 +323,17 @@ public:
h & static_cast<CGObjectInstance&>(*this);
h & static_cast<CBonusSystemNode&>(*this);
h & direction;
h & boardedHeroID;
if (h.hasFeature(Handler::Version::NO_RAW_POINTERS_IN_SERIALIZER))
{
h & boardedHeroID;
}
else
{
std::shared_ptr<CGObjectInstance> ptr;
h & ptr;
boardedHeroID = ptr ? ptr->id : ObjectInstanceID();
}
h & layer;
h & onboardAssaultAllowed;
h & onboardVisitAllowed;