games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

assertions fix

Browse Source
This commit is contained in:
SoundSSGood
2023-05-07 00:59:44 +03:00
parent 3a731b62b8
commit fe3e635332
2 changed files with 2 additions and 5 deletions
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. // we have a different artifact may look surprising... but it's valid.
auto pickedArtInst = std::get<const CArtifactInstance*>(curState.value()); auto pickedArtInst = std::get<const CArtifactInstance*>(curState.value());
assert(srcLoc.isHolder(std::get<const CGHeroInstance*>(curState.value()))); assert(!pickedArtInst || destLoc.isHolder(std::get<const CGHeroInstance*>(curState.value())));
assert(srcLoc.getArt() == pickedArtInst);
auto artifactMovedBody = [this, withRedraw, &srcLoc, &destLoc, &pickedArtInst](auto artSetWeak) -> void 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) void MoveArtifact::applyGs(CGameState * gs)
{ {
CArtifactInstance * art = src.getArt(); CArtifactInstance * art = src.getArt();
if(!ArtifactUtils::isSlotBackpack(dst.slot)) assert(!ArtifactUtils::isSlotEquipment(dst.slot) || !dst.getArt());
assert(!dst.getArt());
art->move(src, dst); art->move(src, dst);
} }