games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-17 00:07:41 +02:00
Code Issues Releases Activity

Fix for callback return. More code optimization

Browse Source
This commit is contained in:
SoundSSGood
2022-11-11 01:01:55 +02:00
parent 9647758812
commit 3142f32cbb
4 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
server/CGameHandler.cpp
View File

@ -3956,37 +3956,37 @@ bool CGameHandler::bulkMoveArtifacts(ObjectInstanceID srcHero, ObjectInstanceID
giveHeroNewArtifact(dstHero, VLC->arth->objects[ArtifactID::SPELLBOOK], ArtifactPosition::SPELLBOOK);
}
};
auto moveArtsInBackpack = [](const CGHeroInstance * pHero,
std::vector<BulkMoveArtifacts::LinkedSlots> & slots) -> void
{
for(auto & slotInfo : pHero->artifactsInBackpack)
{
auto slot = pHero->getArtPos(slotInfo.artifact);
slots.push_back(BulkMoveArtifacts::LinkedSlots(slot, slot));
}
};
// Move over artifacts that are worn srcHero -> dstHero
moveArtsWorn(psrcHero, pdstHero, slotsSrcDst);
// Move over artifacts that are worn dstHero -> srcHero
moveArtsWorn(pdstHero, psrcHero, slotsDstSrc);
// Move over artifacts that are in backpack srcHero -> dstHero
for(auto & slotInfo : psrcHero->artifactsInBackpack)
{
auto slot = psrcHero->getArtPos(slotInfo.artifact);
slotsSrcDst.push_back(BulkMoveArtifacts::LinkedSlots(slot, slot));
}
moveArtsInBackpack(psrcHero, slotsSrcDst);
// Move over artifacts that are in backpack dstHero -> srcHero
for(auto & slotInfo : pdstHero->artifactsInBackpack)
{
auto slot = pdstHero->getArtPos(slotInfo.artifact);
slotsDstSrc.push_back(BulkMoveArtifacts::LinkedSlots(slot, slot));
}
moveArtsInBackpack(pdstHero, slotsDstSrc);
}
else
{
auto & slots = ma.artsPack0;
// Temporary fitting set for artifacts. Used to select available slots before sending data.
CArtifactFittingSet ArtFittingSet(pdstHero->bearerType());
ArtFittingSet.artifactsInBackpack = pdstHero->artifactsInBackpack;
ArtFittingSet.artifactsWorn = pdstHero->artifactsWorn;
auto moveArtifact = [this, &ArtFittingSet, &slots](const CArtifactInstance * artifact,
auto moveArtifact = [this, &ArtFittingSet, &slotsSrcDst](const CArtifactInstance * artifact,
ArtifactPosition srcSlot, const CGHeroInstance * pdstHero) -> void
{
auto dstSlot = ArtifactUtils::getArtifactDstPosition(artifact, &ArtFittingSet, pdstHero->bearerType());
ArtFittingSet.putArtifact(dstSlot, static_cast<ConstTransitivePtr<CArtifactInstance>>(artifact));
slots.push_back(BulkMoveArtifacts::LinkedSlots(srcSlot, dstSlot));
slotsSrcDst.push_back(BulkMoveArtifacts::LinkedSlots(srcSlot, dstSlot));
if(ArtifactUtils::checkSpellbookIsNeeded(pdstHero, artifact->artType->id, dstSlot))
giveHeroNewArtifact(pdstHero, VLC->arth->objects[ArtifactID::SPELLBOOK], ArtifactPosition::SPELLBOOK);