games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

Merge pull request #2135 from SoundSSGood/assert-failure-fix

Browse Source 
CWindowWithArtifacts assert fix
This commit is contained in:
Ivan Savenko 2023-05-08 23:44:47 +03:00 committed by GitHub
commit c21d31289e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/widgets/CWindowWithArtifacts.cpp
View File

@ -229,8 +229,7 @@ void CWindowWithArtifacts::artifactMoved(const ArtifactLocation & srcLoc, const
// we have a different artifact may look surprising... but it's valid.
auto pickedArtInst = std::get<const CArtifactInstance*>(curState.value());
assert(srcLoc.isHolder(std::get<const CGHeroInstance*>(curState.value())));
assert(srcLoc.getArt() == pickedArtInst);
assert(!pickedArtInst || destLoc.isHolder(std::get<const CGHeroInstance*>(curState.value())));
auto artifactMovedBody = [this, withRedraw, &srcLoc, &destLoc, &pickedArtInst](auto artSetWeak) -> void
{

4
lib/NetPacksLib.cpp
View File

@ -1835,9 +1835,7 @@ void EraseArtifact::applyGs(CGameState *gs)
void MoveArtifact::applyGs(CGameState * gs)
{
CArtifactInstance * art = src.getArt();
if(!ArtifactUtils::isSlotBackpack(dst.slot))
assert(!dst.getArt());
assert(!ArtifactUtils::isSlotEquipment(dst.slot) || !dst.getArt());
art->move(src, dst);
}