ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #3823

Browse Source
This commit is contained in:
Alayan 2019-04-15 17:55:48 +02:00
parent aecee4c781
commit 2779487d0b
1 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/challenges/story_mode_status.cpp
View File

@ -101,26 +101,14 @@ void StoryModeStatus::computeActive(bool first_call)
// locks all features, so unlock the solved ones (and don't try to
// save the state, since we are currently reading it)
if (i->second->isSolved(RaceManager::DIFFICULTY_EASY))
// Challenge-specific unlocked features don't depend on
// the difficulty at which the challenge has been solved.
if (i->second->isSolvedAtAnyDifficulty())
{
unlockFeature(i->second, RaceManager::DIFFICULTY_EASY,
/*save*/ false);
}
if (i->second->isSolved(RaceManager::DIFFICULTY_MEDIUM))
{
unlockFeature(i->second, RaceManager::DIFFICULTY_MEDIUM,
/*save*/ false);
}
if (i->second->isSolved(RaceManager::DIFFICULTY_HARD))
{
unlockFeature(i->second, RaceManager::DIFFICULTY_HARD,
/*save*/ false);
}
if (i->second->isSolved(RaceManager::DIFFICULTY_BEST))
{
unlockFeature(i->second, RaceManager::DIFFICULTY_BEST,
/*save*/ false);
}
int gp_factor = i->second->isGrandPrix() ? GP_FACTOR : 1;
@ -261,18 +249,22 @@ void StoryModeStatus::lockFeature(ChallengeStatus *challenge_status)
void StoryModeStatus::unlockFeature(ChallengeStatus* c, RaceManager::Difficulty d,
bool do_save)
{
const unsigned int amount=(unsigned int)c->getData()->getFeatures().size();
for (unsigned int n=0; n<amount; n++)
// Special challenge-specific features are only unlocked once.
if(!c->isSolvedAtAnyDifficulty())
{
std::string feature = c->getData()->getFeatures()[n].m_name;
std::map<std::string,bool>::iterator p=m_locked_features.find(feature);
if (p == m_locked_features.end())
const unsigned int amount=(unsigned int)c->getData()->getFeatures().size();
for (unsigned int n=0; n<amount; n++)
{
c->setSolved(d);
if(do_save) PlayerManager::get()->save();
return;
std::string feature = c->getData()->getFeatures()[n].m_name;
std::map<std::string,bool>::iterator p=m_locked_features.find(feature);
if (p == m_locked_features.end())
{
c->setSolved(d);
if(do_save) PlayerManager::get()->save();
return;
}
m_locked_features.erase(p);
}
m_locked_features.erase(p);
}
// Add to list of recently unlocked features