games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-05 15:05:40 +02:00
Code Issues Releases Activity

Merge pull request #4889 from kdmcser/artifact_sort_fix

Browse Source 
crash fix: artifact sort by slot
This commit is contained in:
Ivan Savenko 2024-11-13 20:50:40 +02:00 committed by GitHub
commit 004b7892f2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/CGameHandler.cpp
View File

@ -2771,7 +2771,24 @@ bool CGameHandler::manageBackpackArtifacts(const PlayerColor & player, const Obj
{
makeSortBackpackRequest([](const ArtSlotInfo & inf) -> int32_t
{
return inf.getArt()->getType()->getPossibleSlots().at(ArtBearer::HERO).front().num;
auto possibleSlots = inf.getArt()->getType()->getPossibleSlots();
if (possibleSlots.find(ArtBearer::CREATURE) != possibleSlots.end() && !possibleSlots.at(ArtBearer::CREATURE).empty())
{
return -2;
}
else if (possibleSlots.find(ArtBearer::COMMANDER) != possibleSlots.end() && !possibleSlots.at(ArtBearer::COMMANDER).empty())
{
return -1;
}
else if (possibleSlots.find(ArtBearer::HERO) != possibleSlots.end() && !possibleSlots.at(ArtBearer::HERO).empty())
{
return inf.getArt()->getType()->getPossibleSlots().at(ArtBearer::HERO).front().num;
}
else
{
// for grail
return -3;
}
});
}
else if(sortType == ManageBackpackArtifacts::ManageCmd::SORT_BY_COST)