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

BulkEraseArtifacts network pack

Browse Source
This commit is contained in:
SoundSSGood
2024-08-29 18:47:06 +03:00
parent 247be94015
commit e15ea4fc75
9 changed files with 68 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/CGameHandler.cpp
View File

@ -1189,10 +1189,16 @@ void CGameHandler::stopHeroVisitCastle(const CGTownInstance * obj, const CGHeroI
sendAndApply(&vc);
}
void CGameHandler::removeArtifact(const ArtifactLocation &al)
void CGameHandler::removeArtifact(const ArtifactLocation & al)
{
EraseArtifact ea;
ea.al = al;
removeArtifact(al.artHolder, {al.slot});
}
void CGameHandler::removeArtifact(const ObjectInstanceID & srcId, const std::vector<ArtifactPosition> & slotsPack)
{
BulkEraseArtifacts ea;
ea.artHolder = srcId;
ea.posPack.insert(ea.posPack.end(), slotsPack.begin(), slotsPack.end());
sendAndApply(&ea);
}
@ -3491,8 +3497,10 @@ bool CGameHandler::sacrificeArtifact(const IMarket * market, const CGHeroInstanc
const auto artSet = market->getArtifactsStorage();
int expSum = 0;
auto finish = [this, &hero, &expSum]()
std::vector<ArtifactPosition> artPack;
auto finish = [this, &hero, &expSum, &artPack, market]()
{
removeArtifact(market->getObjInstanceID(), artPack);
giveExperience(hero, hero->calculateXp(expSum));
};
@ -3506,7 +3514,7 @@ bool CGameHandler::sacrificeArtifact(const IMarket * market, const CGHeroInstanc
int expToGive;
market->getOffer(art->getTypeId(), 0, dmp, expToGive, EMarketMode::ARTIFACT_EXP);
expSum += expToGive;
removeArtifact(ArtifactLocation(market->getObjInstanceID(), artSet->getArtPos(art)));
artPack.push_back(artSet->getArtPos(art));
}
else
{