games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

Fixed deserialization of new artifacts (and possibly some other objects)

Browse Source 
Was broken in my previous PR, since pointer graph serialization was
enabled by default, leading to deserializationFix triggering on netpack
apply.

Cleaned up / clarified code
This commit is contained in:
Ivan Savenko
2024-07-27 16:51:23 +00:00
parent dac18ae35a
commit 48c92711f2
9 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/serializer/BinaryDeserializer.h
View File

@@ -165,8 +165,9 @@ public:
std::map<uint32_t, Serializeable*> loadedPointers;
std::map<const Serializeable*, std::shared_ptr<Serializeable>> loadedSharedPointers;
IGameCallback * cb = nullptr;
bool smartPointerSerialization;
bool saving;
static constexpr bool trackSerializedPointers = true;
static constexpr bool saving = false;
bool loadingGamestate = false;
bool hasFeature(Version what) const
{
@@ -342,7 +343,7 @@ public:
}
uint32_t pid = 0xffffffff; //pointer id (or maybe rather pointee id)
if(smartPointerSerialization)
if(trackSerializedPointers)
{
load( pid ); //get the id
auto i = loadedPointers.find(pid); //lookup
@@ -383,7 +384,7 @@ public:
template <typename T>
void ptrAllocated(T *ptr, uint32_t pid)
{
if(smartPointerSerialization && pid != 0xffffffff)
if(trackSerializedPointers && pid != 0xffffffff)
loadedPointers[pid] = const_cast<Serializeable*>(dynamic_cast<const Serializeable*>(ptr)); //add loaded pointer to our lookup map; cast is to avoid errors with const T* pt
}