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

Fix crashes on game start, gamestate now derives from GameCallbackHolder

Browse Source
This commit is contained in:
Ivan Savenko
2025-04-01 15:59:08 +03:00
parent d34b47bb20
commit d1d2cf4189
21 changed files with 99 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/CCreatureSet.cpp
View File

@@ -334,6 +334,15 @@ void CCreatureSet::addToSlot(const SlotID & slot, std::unique_ptr<CStackInstance
}
}
void CCreatureSet::deserializationFix()
{
for(const auto & elem : stacks)
{
elem.second->attachTo(*getArmy());
elem.second->artDeserializationFix(elem.second.get());
}
}
bool CCreatureSet::validTypes(bool allowUnrandomized) const
{
for(const auto & elem : stacks)
@@ -517,7 +526,7 @@ void CCreatureSet::putStack(const SlotID & slot, std::unique_ptr<CStackInstance>
assert(slot.getNum() < GameConstants::ARMY_SIZE);
assert(!hasStackAtSlot(slot));
stacks[slot] = std::move(stack);
stack->setArmy(getArmy());
stacks[slot]->setArmy(getArmy());
armyChanged();
}
@@ -536,10 +545,7 @@ void CCreatureSet::changeStackCount(const SlotID & slot, TQuantity toAdd)
setStackCount(slot, getStackCount(slot) + toAdd);
}
CCreatureSet::~CCreatureSet()
{
clearSlots();
}
CCreatureSet::~CCreatureSet() = default;
void CCreatureSet::setToArmy(CSimpleArmy &src)
{
@@ -864,19 +870,11 @@ TerrainId CStackInstance::getNativeTerrain() const
return getFactionID().toEntity(LIBRARY)->getNativeTerrain();
}
TerrainId CStackInstance::getCurrentTerrain() const
{
return getArmy()->getCurrentTerrain();
}
void CStackInstance::deserializationFix()
{
const CArmedInstance *armyBackup = getArmy();
armyInstanceID = {};
setArmy(armyBackup);
artDeserializationFix(this);
}
CreatureID CStackInstance::getCreatureID() const
{