mirror of
https://github.com/vcmi/vcmi.git
synced 2025-01-12 02:28:11 +02:00
Merge pull request #67 from ArseniyShestakov/fixIssue1912
Okay, let's do this.
This commit is contained in:
commit
0d2879158b
@ -27,7 +27,7 @@
|
||||
#include "mapping/CCampaignHandler.h" //for CCampaignState
|
||||
#include "rmg/CMapGenerator.h" // for CMapGenOptions
|
||||
|
||||
const ui32 version = 750;
|
||||
const ui32 version = 751;
|
||||
const ui32 minSupportedVersion = version;
|
||||
|
||||
class CISer;
|
||||
|
@ -269,7 +269,7 @@ public:
|
||||
|
||||
template <typename Handler> void serialize(Handler &h, const int version)
|
||||
{
|
||||
h & static_cast<CGObjectInstance&>(*this);
|
||||
h & static_cast<CRewardableObject&>(*this);
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -38,7 +38,6 @@ void registerTypesMapObjects1(Serializer &s)
|
||||
s.template registerType<CGObjectInstance, CGTeleport>();
|
||||
s.template registerType<CGObjectInstance, CGSignBottle>();
|
||||
s.template registerType<CGObjectInstance, CGScholar>();
|
||||
s.template registerType<CGObjectInstance, CGBonusingObject>();
|
||||
s.template registerType<CGObjectInstance, CGMagicWell>();
|
||||
s.template registerType<CGObjectInstance, CGObservatory>();
|
||||
s.template registerType<CGObjectInstance, CGKeys>();
|
||||
@ -142,6 +141,7 @@ void registerTypesMapObjects2(Serializer &s)
|
||||
|
||||
s.template registerType<CGObjectInstance, CRewardableObject>();
|
||||
s.template registerType<CRewardableObject, CGPickable>();
|
||||
s.template registerType<CRewardableObject, CGBonusingObject>();
|
||||
s.template registerType<CRewardableObject, CGVisitableOPH>();
|
||||
s.template registerType<CRewardableObject, CGVisitableOPW>();
|
||||
s.template registerType<CRewardableObject, CGOnceVisitable>();
|
||||
|
Loading…
Reference in New Issue
Block a user