Fix regression

Alayan-stk-2 · Alayan-stk-2 · commit eba9dfcb2561 · 2019-04-17T17:25:18.000+02:00
diff --git a/src/challenges/story_mode_status.cpp b/src/challenges/story_mode_status.cpp
@@ -93,9 +93,13 @@ void StoryModeStatus::computeActive(bool first_call)
     for(i = m_challenges_state.begin();
         i != m_challenges_state.end();  i++)
     {
-        // Changed challenge
-        // -----------------
-        if(!i->second->isUnlockList() && (i->second)->isSolvedAtAnyDifficulty())
+        // Lock features from unsolved challenges
+        if(!(i->second)->isSolvedAtAnyDifficulty())
+        {
+            lockFeature(i->second);
+        }
+        // Count points from solved challenges
+        else if(!i->second->isUnlockList())
         {
             int gp_factor = i->second->isGrandPrix() ? GP_FACTOR : 1;
 
@@ -120,12 +124,6 @@ void StoryModeStatus::computeActive(bool first_call)
                 m_easy_challenges++;
             }
         }
-        else
-        {
-            // Otherwise lock the feature
-            // --------------------------
-            lockFeature(i->second);
-        }
 
         switch(i->second->highestSolved())
         {

Original file line number	Diff line number	Diff line change
`@@ -93,9 +93,13 @@ void StoryModeStatus::computeActive(bool first_call)`
`93`	`93`	`for(i = m_challenges_state.begin();`
`94`	`94`	`i != m_challenges_state.end(); i++)`
`95`	`95`	`{`
`96`		`- // Changed challenge`
`97`		`- // -----------------`
`98`		`- if(!i->second->isUnlockList() && (i->second)->isSolvedAtAnyDifficulty())`
	`96`	`+ // Lock features from unsolved challenges`
	`97`	`+ if(!(i->second)->isSolvedAtAnyDifficulty())`
	`98`	`+ {`
	`99`	`+ lockFeature(i->second);`
	`100`	`+ }`
	`101`	`+ // Count points from solved challenges`
	`102`	`+ else if(!i->second->isUnlockList())`
`99`	`103`	`{`
`100`	`104`	`int gp_factor = i->second->isGrandPrix() ? GP_FACTOR : 1;`
`101`	`105`
`@@ -120,12 +124,6 @@ void StoryModeStatus::computeActive(bool first_call)`
`120`	`124`	`m_easy_challenges++;`
`121`	`125`	`}`
`122`	`126`	`}`
`123`		`- else`
`124`		`- {`
`125`		`- // Otherwise lock the feature`
`126`		`- // --------------------------`
`127`		`- lockFeature(i->second);`
`128`		`- }`
`129`	`127`
`130`	`128`	`switch(i->second->highestSolved())`
`131`	`129`	`{`