SortOrder_AvgDifficulty is unused.
This commit is contained in:
@@ -638,13 +638,13 @@ RageColor Course::GetColor() const
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case PrefsManager::COURSE_SORT_METER:
|
case PrefsManager::COURSE_SORT_METER:
|
||||||
if (SortOrder_AvgDifficulty > 100)
|
if (GetMeter() > 100)
|
||||||
return RageColor(0,0,1,1); // blue
|
return RageColor(0,0,1,1); // blue
|
||||||
if (SortOrder_AvgDifficulty > 8.5)
|
if (GetMeter() > 8.5)
|
||||||
return RageColor(1,0,0,1); // red
|
return RageColor(1,0,0,1); // red
|
||||||
if (SortOrder_AvgDifficulty >= 7)
|
if (GetMeter() >= 7)
|
||||||
return RageColor(1,0.5f,0,1); // orange
|
return RageColor(1,0.5f,0,1); // orange
|
||||||
if (SortOrder_AvgDifficulty >= 5)
|
if (GetMeter() >= 5)
|
||||||
return RageColor(1,1,0,1); // yellow
|
return RageColor(1,1,0,1); // yellow
|
||||||
return RageColor(0,1,0,1); // green
|
return RageColor(0,1,0,1); // green
|
||||||
|
|
||||||
@@ -956,7 +956,6 @@ bool Course::HasBanner() const
|
|||||||
|
|
||||||
void Course::UpdateCourseStats()
|
void Course::UpdateCourseStats()
|
||||||
{
|
{
|
||||||
SortOrder_AvgDifficulty = 0;
|
|
||||||
SortOrder_TotalDifficulty = 0;
|
SortOrder_TotalDifficulty = 0;
|
||||||
|
|
||||||
unsigned i;
|
unsigned i;
|
||||||
@@ -967,7 +966,6 @@ void Course::UpdateCourseStats()
|
|||||||
if ( m_entries[i].type == COURSE_ENTRY_FIXED )
|
if ( m_entries[i].type == COURSE_ENTRY_FIXED )
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
SortOrder_AvgDifficulty = 9999999; // large number
|
|
||||||
if ( SortOrder_Ranking == 2 )
|
if ( SortOrder_Ranking == 2 )
|
||||||
SortOrder_Ranking = 3;
|
SortOrder_Ranking = 3;
|
||||||
SortOrder_TotalDifficulty = 999999; // large number
|
SortOrder_TotalDifficulty = 999999; // large number
|
||||||
@@ -980,14 +978,11 @@ void Course::UpdateCourseStats()
|
|||||||
for( i = 0; i < ci.size(); i++ )
|
for( i = 0; i < ci.size(); i++ )
|
||||||
SortOrder_TotalDifficulty += ci[i].pNotes->GetMeter();
|
SortOrder_TotalDifficulty += ci[i].pNotes->GetMeter();
|
||||||
|
|
||||||
SortOrder_AvgDifficulty = (float)SortOrder_TotalDifficulty/GetEstimatedNumStages();
|
|
||||||
|
|
||||||
// OPTIMIZATION: Ranking info isn't dependant on style, so
|
// OPTIMIZATION: Ranking info isn't dependant on style, so
|
||||||
// call it sparingly. Its handled on startup and when
|
// call it sparingly. Its handled on startup and when
|
||||||
// themes change..
|
// themes change..
|
||||||
|
|
||||||
LOG->Trace("%s: Total feet: %d, Average Difficulty: %f",
|
LOG->Trace("%s: Total feet: %d, Average Difficulty: %f",
|
||||||
this->m_sName.c_str(),
|
this->m_sName.c_str(),
|
||||||
SortOrder_TotalDifficulty,
|
SortOrder_TotalDifficulty );
|
||||||
SortOrder_AvgDifficulty);
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -145,7 +145,6 @@ public:
|
|||||||
|
|
||||||
// sorting values
|
// sorting values
|
||||||
int SortOrder_TotalDifficulty;
|
int SortOrder_TotalDifficulty;
|
||||||
float SortOrder_AvgDifficulty;
|
|
||||||
int SortOrder_Ranking;
|
int SortOrder_Ranking;
|
||||||
|
|
||||||
void UpdateCourseStats();
|
void UpdateCourseStats();
|
||||||
|
|||||||
Reference in New Issue
Block a user