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

Removed pointer to army from StackInstance

Browse Source
This commit is contained in:
Ivan Savenko
2025-03-18 23:30:06 +00:00
parent 16a06179cf
commit 63d00b080e
80 changed files with 260 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
lib/serializer/BinaryDeserializer.h
View File

@@ -37,45 +37,6 @@ public:
/// Effectively revesed version of BinarySerializer
class BinaryDeserializer : public CLoaderBase
{
template<typename Fake, typename T>
static bool loadIfStackInstance(T &data)
{
return false;
}
template<typename Fake>
bool loadIfStackInstance(const CStackInstance* &data)
{
CArmedInstance * armyPtr = nullptr;
ObjectInstanceID armyID;
SlotID slot;
load(armyID);
load(slot);
if (armyID == ObjectInstanceID::NONE)
return false;
if(reader->smartVectorMembersSerialization)
{
if(const auto *info = reader->getVectorizedTypeInfo<CArmedInstance, ObjectInstanceID>())
armyPtr = reader->getVectorItemFromId<CArmedInstance, ObjectInstanceID>(*info, armyID);
}
if(slot != SlotID::COMMANDER_SLOT_PLACEHOLDER)
{
assert(armyPtr->hasStackAtSlot(slot));
data = armyPtr->stacks[slot];
}
else
{
auto * hero = dynamic_cast<CGHeroInstance *>(armyPtr);
assert(hero);
assert(hero->getCommander());
data = hero->getCommander();
}
return true;
}
STRONG_INLINE uint32_t readAndCheckLength()
{
uint32_t length;
@@ -258,13 +219,6 @@ public:
}
}
if(reader->sendStackInstanceByIds)
{
bool gotLoaded = loadIfStackInstance<void>(data);
if(gotLoaded)
return;
}
uint32_t pid = 0xffffffff; //pointer id (or maybe rather pointee id)
if(trackSerializedPointers)
{