games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'vcmi/develop' into warnings_fix

Browse Source
This commit is contained in:
Ivan Savenko
2022-12-23 14:40:45 +02:00
parent 0f2d4f119b f073c676f9
commit eb20a4b208
188 changed files with 9050 additions and 6995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/NetPacksLib.cpp
View File

@@ -1175,7 +1175,10 @@ DLL_LINKAGE void AssembledArtifact::applyGs(CGameState *gs)
const CArtifactInstance *transformedArt = al.getArt();
assert(transformedArt);
bool combineEquipped = !ArtifactUtils::isSlotBackpack(al.slot);
assert(vstd::contains(transformedArt->assemblyPossibilities(artSet, combineEquipped), builtArt));
assert(vstd::contains_if(transformedArt->assemblyPossibilities(artSet, combineEquipped), [=](const CArtifact * art)->bool
{
return art->id == builtArt->id;
}));
MAYBE_UNUSED(transformedArt);
auto combinedArt = new CCombinedArtifactInstance(builtArt);