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

Fix serialization of rewardable objects

Browse Source
This commit is contained in:
Ivan Savenko
2023-03-06 13:21:28 +02:00
parent 5f396af14c
commit 0c847c85cc
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/mapObjects/CRewardableConstructor.h
View File

@@ -46,6 +46,11 @@ public:
void configureObject(CRewardableObject * object, CRandomGenerator & rng) const; void configureObject(CRewardableObject * object, CRandomGenerator & rng) const;
void init(const JsonNode & objectConfig); void init(const JsonNode & objectConfig);
template <typename Handler> void serialize(Handler &h, const int version)
{
h & parameters;
}
}; };
class DLL_LINKAGE CRewardableConstructor : public AObjectTypeHandler class DLL_LINKAGE CRewardableConstructor : public AObjectTypeHandler
@@ -60,6 +65,14 @@ public:
void configureObject(CGObjectInstance * object, CRandomGenerator & rng) const override; void configureObject(CGObjectInstance * object, CRandomGenerator & rng) const override;
std::unique_ptr<IObjectInfo> getObjectInfo(std::shared_ptr<const ObjectTemplate> tmpl) const override; std::unique_ptr<IObjectInfo> getObjectInfo(std::shared_ptr<const ObjectTemplate> tmpl) const override;
template <typename Handler> void serialize(Handler &h, const int version)
{
AObjectTypeHandler::serialize(h, version);
if (version >= 816)
h & objectInfo;
}
}; };
VCMI_LIB_NAMESPACE_END VCMI_LIB_NAMESPACE_END

1
lib/mapObjects/CRewardableObject.cpp
View File

@@ -544,6 +544,7 @@ void CRewardableObject::newTurn(CRandomGenerator & rand) const
void CRewardableObject::initObj(CRandomGenerator & rand) void CRewardableObject::initObj(CRandomGenerator & rand)
{ {
VLC->objtypeh->getHandlerFor(ID, subID)->configureObject(this, rand); VLC->objtypeh->getHandlerFor(ID, subID)->configureObject(this, rand);
assert(!info.empty());
} }
CRewardableObject::CRewardableObject(): CRewardableObject::CRewardableObject():

2
lib/serializer/CSerializer.h
View File

@@ -14,7 +14,7 @@
VCMI_LIB_NAMESPACE_BEGIN VCMI_LIB_NAMESPACE_BEGIN
const ui32 SERIALIZATION_VERSION = 815; const ui32 SERIALIZATION_VERSION = 816;
const ui32 MINIMAL_SERIALIZATION_VERSION = 813; const ui32 MINIMAL_SERIALIZATION_VERSION = 813;
const std::string SAVEGAME_MAGIC = "VCMISVG"; const std::string SAVEGAME_MAGIC = "VCMISVG";