games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-13 01:20:34 +02:00
Code Issues Releases Activity

Fix regressions in combat

Browse Source
This commit is contained in:
Ivan Savenko
2025-04-19 11:25:18 +03:00
parent a89cf280e3
commit ce436bd63e
7 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/CStack.cpp
View File

@ -405,9 +405,9 @@ void CStack::spendMana(ServerCallback * server, const int spellCost) const
server->apply(ssp);
}
void CStack::postDeserialize(const CArmedInstance * army, const SlotID & extSlot)
void CStack::postDeserialize(const CArmedInstance * army)
{
if(extSlot == SlotID::COMMANDER_SLOT_PLACEHOLDER)
if(slot == SlotID::COMMANDER_SLOT_PLACEHOLDER)
{
const auto * hero = dynamic_cast<const CGHeroInstance *>(army);
assert(hero);
@ -418,14 +418,13 @@ void CStack::postDeserialize(const CArmedInstance * army, const SlotID & extSlot
//no external slot possible, so no base stack
base = nullptr;
}
else if(!army || extSlot == SlotID() || !army->hasStackAtSlot(extSlot))
else if(!army || slot == SlotID() || !army->hasStackAtSlot(slot))
{
base = nullptr;
logGlobal->warn("%s doesn't have a base stack!", typeID.toEntity(LIBRARY)->getNameSingularTranslated());
throw std::runtime_error(typeID.toEntity(LIBRARY)->getNameSingularTranslated() + " doesn't have a base stack!");
}
else
{
base = &army->getStack(extSlot);
base = &army->getStack(slot);
}
doubleWideCached = battle::CUnitState::doubleWide();