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

artifacts swap optimization

Browse Source
This commit is contained in:
SoundSSGood
2023-11-07 22:12:32 +02:00
parent 8aea2be0db
commit ce3d407396
5 changed files with 62 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/networkPacks/NetPacksLib.cpp
View File

@ -1837,13 +1837,13 @@ void BulkMoveArtifacts::applyGs(CGameState * gs)
switch(operation)
{
case EBulkArtsOp::BULK_MOVE:
art->move(artSet, srcPos, *gs->getHero(dstArtHolder), slot.dstPos);
art->move(artSet, srcPos, *gs->getArtSet(ArtifactLocation(dstArtHolder, dstCreature)), slot.dstPos);
break;
case EBulkArtsOp::BULK_REMOVE:
art->removeFrom(artSet, srcPos);
break;
case EBulkArtsOp::BULK_PUT:
art->putAt(*gs->getHero(srcArtHolder), slot.dstPos);
art->putAt(*gs->getArtSet(ArtifactLocation(srcArtHolder, srcCreature)), slot.dstPos);
break;
default:
break;
@ -1856,11 +1856,11 @@ void BulkMoveArtifacts::applyGs(CGameState * gs)
}
};
auto * leftSet = gs->getArtSet(ArtifactLocation(srcArtHolder));
auto * leftSet = gs->getArtSet(ArtifactLocation(srcArtHolder, srcCreature));
if(swap)
{
// Swap
auto * rightSet = gs->getArtSet(ArtifactLocation(dstArtHolder));
auto * rightSet = gs->getArtSet(ArtifactLocation(dstArtHolder, dstCreature));
CArtifactFittingSet artFittingSet(leftSet->bearerType());
artFittingSet.artifactsWorn = rightSet->artifactsWorn;