games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +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

30
lib/CStack.h
View File

@@ -109,21 +109,21 @@ public:
h & side;
h & initialPosition;
const CArmedInstance * army = (base ? base->armyObj : nullptr);
SlotID extSlot = (base ? base->armyObj->findStack(base) : SlotID());
if(h.saving)
{
h & army;
h & extSlot;
}
else
{
h & army;
h & extSlot;
postDeserialize(army, extSlot);
}
// const CArmedInstance * army = (base ? base->armyObj : nullptr);
// SlotID extSlot = (base ? base->armyObj->findStack(base) : SlotID());
//
// if(h.saving)
// {
// h & army;
// h & extSlot;
// }
// else
// {
// h & army;
// h & extSlot;
//
// postDeserialize(army, extSlot);
// }
}
private: