games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-14 02:33:51 +02:00
Code Issues Releases Activity

Merge pull request #2083 from IvanSavenko/artifact_fix

Browse Source 
Fix list of treasures getting overwritten
This commit is contained in:
Ivan Savenko 2023-04-28 15:41:38 +03:00 committed by GitHub
commit 93362eb692
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
lib/CArtHandler.cpp
View File

@ -740,35 +740,36 @@ void CArtHandler::erasePickedArt(const ArtifactID & id)
{
CArtifact *art = objects[id];
if(!(art->aClass & CArtifact::ART_SPECIAL))
std::vector<CArtifact*> * artifactList = nullptr;
switch(art->aClass)
{
auto & artifactList = treasures;
switch(art->aClass)
{
case CArtifact::ART_MINOR:
artifactList = minors;
break;
case CArtifact::ART_MAJOR:
artifactList = majors;
break;
case CArtifact::ART_RELIC:
artifactList = relics;
break;
}
if(artifactList.empty())
fillList(artifactList, art->aClass);
case CArtifact::ART_TREASURE:
artifactList = &treasures;
break;
case CArtifact::ART_MINOR:
artifactList = &minors;
break;
case CArtifact::ART_MAJOR:
artifactList = &majors;
break;
case CArtifact::ART_RELIC:
artifactList = &relics;
break;
default:
logMod->warn("Problem: cannot find list for artifact %s, strange class. (special?)", art->getNameTranslated());
return;
}
auto itr = vstd::find(artifactList, art);
if(itr != artifactList.end())
{
artifactList.erase(itr);
}
else
logMod->warn("Problem: cannot erase artifact %s from list, it was not present", art->getNameTranslated());
if(artifactList->empty())
fillList(*artifactList, art->aClass);
auto itr = vstd::find(*artifactList, art);
if(itr != artifactList->end())
{
artifactList->erase(itr);
}
else
logMod->warn("Problem: cannot find list for artifact %s, strange class. (special?)", art->getNameTranslated());
logMod->warn("Problem: cannot erase artifact %s from list, it was not present", art->getNameTranslated());
}
void CArtHandler::fillList( std::vector<CArtifact*> &listToBeFilled, CArtifact::EartClass artifactClass )