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

Regression fixed

Browse Source
This commit is contained in:
SoundSSGood
2023-02-13 12:56:23 +02:00
parent 8504102c53
commit 0f93b0991c
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/NetPacksClient.cpp
View File

@ -294,8 +294,9 @@ void BulkMoveArtifacts::applyCl(CClient * cl)
{ {
auto srcLoc = ArtifactLocation(srcArtHolder, slotToMove.srcPos); auto srcLoc = ArtifactLocation(srcArtHolder, slotToMove.srcPos);
auto dstLoc = ArtifactLocation(dstArtHolder, slotToMove.dstPos); auto dstLoc = ArtifactLocation(dstArtHolder, slotToMove.dstPos);
MoveArtifact ma(&srcLoc, &dstLoc, false); callInterfaceIfPresent(cl, srcLoc.owningPlayer(), &IGameEventsReceiver::artifactMoved, srcLoc, dstLoc);
ma.applyCl(cl); if(srcLoc.owningPlayer() != dstLoc.owningPlayer())
callInterfaceIfPresent(cl, dstLoc.owningPlayer(), &IGameEventsReceiver::artifactMoved, srcLoc, dstLoc);
} }
}; };

7
client/widgets/CArtifactHolder.cpp
View File

@ -752,9 +752,10 @@ void CArtifactsOfHero::artifactMoved(const ArtifactLocation & src, const Artifac
assert(commonInfo->src.AOH); assert(commonInfo->src.AOH);
CCS->curh->dragAndDropCursor("artifact", dst.getArt()->artType->getIconIndex()); CCS->curh->dragAndDropCursor("artifact", dst.getArt()->artType->getIconIndex());
} }
auto art = dst.getArt(); if(!curHero->artifactsTransitionPos.empty())
if(art && dst.slot == ArtifactPosition::TRANSITION_POS) {
markPossibleSlots(art); markPossibleSlots(curHero->getArt(ArtifactPosition::TRANSITION_POS));
}
} }
updateParentWindow(); updateParentWindow();

2
lib/CArtHandler.cpp
View File

@ -1027,6 +1027,8 @@ bool CCombinedArtifactInstance::canBePutAt(const CArtifactSet * artSet, Artifact
{ {
if(slot == ArtifactPosition::TRANSITION_POS) if(slot == ArtifactPosition::TRANSITION_POS)
return true; return true;
if(!CArtifactInstance::canBePutAt(artSet, slot, assumeDestRemoved))
return false;
if(ArtifactUtils::isSlotBackpack(slot)) if(ArtifactUtils::isSlotBackpack(slot))
return true; //we can always remove combined art to the backapck return true; //we can always remove combined art to the backapck