games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-01 23:12:49 +02:00
Code Issues Releases Activity

Stack instance now stores non-serialized pointer to army

Browse Source
This commit is contained in:
Ivan Savenko
2025-04-30 22:10:06 +03:00
parent 313a1119ea
commit 1690913ba4
6 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/CCreatureSet.h
View File

@@ -76,7 +76,7 @@ class DLL_LINKAGE CStackInstance : public CBonusSystemNode, public CStackBasicDe
BonusValueCache nativeTerrain;
BonusValueCache initiative;
ObjectInstanceID armyInstanceID; //stack must be part of some army, army must be part of some object
CArmedInstance * armyInstance = nullptr; //stack must be part of some army, army must be part of some object
IGameCallback * getCallback() const final { return cb; }
@@ -92,7 +92,7 @@ public:
CArmedInstance * getArmy();
const CArmedInstance * getArmy() const; //stack must be part of some army, army must be part of some object
void setArmy(const CArmedInstance *ArmyObj);
void setArmy(CArmedInstance *ArmyObj);
TExpType getTotalExperience() const;
TExpType getAverageExperience() const;
@@ -104,15 +104,19 @@ public:
h & static_cast<CStackBasicDescriptor&>(*this);
h & static_cast<CArtifactSet&>(*this);
if (h.hasFeature(Handler::Version::STACK_INSTANCE_ARMY_FIX))
{
// no-op
}
if (h.hasFeature(Handler::Version::NO_RAW_POINTERS_IN_SERIALIZER))
{
h & armyInstanceID;
ObjectInstanceID dummyID;
h & dummyID;
}
else
{
std::shared_ptr<CGObjectInstance> army;
h & army;
armyInstanceID = army->id;
}
h & totalExperience;