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

Mod system improvement Part I : Fix content losing after deserialization

Browse Source
This commit is contained in:
Dmitry Orlov
2020-10-10 00:31:23 +03:00
parent bf07cd0ad9
commit 195fb8ff41
7 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/VCMI_Lib.h
View File

@@ -21,6 +21,7 @@ class CObjectClassesHandler;
class CTownHandler;
class CGeneralTextHandler;
class CModHandler;
class CContentHandler;
class IBonusTypeHandler;
class CBonusTypeHandler;
class CTerrainViewPatternConfig;
@@ -33,6 +34,9 @@ class DLL_LINKAGE LibClasses
void callWhenDeserializing(); //should be called only by serialize !!!
void makeNull(); //sets all handler pointers to null
std::shared_ptr<CContentHandler> getContent() const;
void setContent(std::shared_ptr<CContentHandler> content);
public:
bool IS_AI_ENABLED; //unused?
@@ -73,7 +77,16 @@ public:
{
h & skillh;
}
h & modh;
if(!h.saving)
{
//modh will be changed and modh->content will be empty after deserialization
auto content = getContent();
h & modh;
setContent(content);
}
else
h & modh;
h & IS_AI_ENABLED;
h & bth;
if(!h.saving)