1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-10 22:31:40 +02:00

merge changes

This commit is contained in:
kdmcser
2024-11-09 17:37:06 +08:00
committed by GitHub
parent 5f4a5228ce
commit e12b72a839

View File

@@ -2771,7 +2771,7 @@ bool CGameHandler::manageBackpackArtifacts(const PlayerColor & player, const Obj
{ {
makeSortBackpackRequest([](const ArtSlotInfo & inf) -> int32_t makeSortBackpackRequest([](const ArtSlotInfo & inf) -> int32_t
{ {
auto possibleSlots = inf.getArt()->artType->getPossibleSlots(); auto possibleSlots = inf.getArt()->getType()->getPossibleSlots();
if (possibleSlots.find(ArtBearer::CREATURE) != possibleSlots.end() && !possibleSlots.at(ArtBearer::CREATURE).empty()) if (possibleSlots.find(ArtBearer::CREATURE) != possibleSlots.end() && !possibleSlots.at(ArtBearer::CREATURE).empty())
{ {
return -2; return -2;
@@ -2786,7 +2786,7 @@ bool CGameHandler::manageBackpackArtifacts(const PlayerColor & player, const Obj
} }
else else
{ {
logGlobal->error("Unable to get artifact %s slot.", inf.getArt()->artType->getNameTextID()); logGlobal->error("Unable to get artifact %s slot.", inf.getArt()->getType()->getNameTextID());
return -3; return -3;
} }
}); });