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

Code style: serialize everything on own lines for easier debugging (#357)

Browse Source
This commit is contained in:
ArseniyShestakov
2017-07-31 16:35:42 +03:00
committed by GitHub
parent 980926a7bd
commit 9d9c026c85
49 changed files with 1207 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/CStack.h
View File

@@ -117,7 +117,9 @@ public:
{
if(!h.saving)
reset();
h & firstHPleft & fullUnits & resurrected;
h & firstHPleft;
h & fullUnits;
h & resurrected;
}
private:
void addResurrected(int32_t amount);
@@ -251,21 +253,32 @@ public:
template <typename Handler> void serialize(Handler & h, const int version)
{
assert(isIndependentNode());
h & static_cast<CBonusSystemNode &>(*this);
h & static_cast<CBonusSystemNode&>(*this);
h & type;
h & ID & baseAmount & owner & slot & side & position & state;
h & shots & casts & counterAttacks & health;
h & ID;
h & baseAmount;
h & owner;
h & slot;
h & side;
h & position;
h & state;
h & shots;
h & casts;
h & counterAttacks;
h & health;
const CArmedInstance * army = (base ? base->armyObj : nullptr);
SlotID extSlot = (base ? base->armyObj->findStack(base) : SlotID());
if(h.saving)
{
h & army & extSlot;
h & army;
h & extSlot;
}
else
{
h & army & extSlot;
h & army;
h & extSlot;
if(extSlot == SlotID::COMMANDER_SLOT_PLACEHOLDER)
{
auto hero = dynamic_cast<const CGHeroInstance *>(army);