actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Make Course::GetMeter return a float. Use it in the sort again. This

Browse Source 
fixes the sort ignoring #METER, not handling random difficulties the
same way as the difficulty meter, etc.
This commit is contained in:
Glenn Maynard
2003-08-11 23:58:32 +00:00
parent 4443730c98
commit 607beaaed0
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Course.cpp
+9 -13
View File
@@ -87,16 +87,19 @@ PlayMode Course::GetPlayMode() const
} }
const int DifficultMeterRamp = 3; const int DifficultMeterRamp = 3;
int Course::GetMeter( int Difficult ) const float Course::GetMeter( int Difficult ) const
{ {
if( m_iMeter != -1 ) if( m_iMeter != -1 )
return m_iMeter + IsDifficult(Difficult)? DifficultMeterRamp:0; return float(m_iMeter + IsDifficult(Difficult)? DifficultMeterRamp:0);
/*LOG->Trace( "Course file '%s' contains a song '%s%s%s' that is not present", /*LOG->Trace( "Course file '%s' contains a song '%s%s%s' that is not present",
m_sPath.c_str(), sGroup.c_str(), sGroup.size()? SLASH:"", sSong.c_str());*/ m_sPath.c_str(), sGroup.c_str(), sGroup.size()? SLASH:"", sSong.c_str());*/
vector<Info> ci; vector<Info> ci;
GetCourseInfo( GAMESTATE->GetCurrentStyleDef()->m_StepsType, ci, Difficult ); GetCourseInfo( GAMESTATE->GetCurrentStyleDef()->m_StepsType, ci, Difficult );
if( ci.size() == 0 )
return 0;
/* Take the average meter. */ /* Take the average meter. */
float fTotalMeter = 0; float fTotalMeter = 0;
for( unsigned c = 0; c < ci.size(); ++c ) for( unsigned c = 0; c < ci.size(); ++c )
@@ -109,7 +112,7 @@ int Course::GetMeter( int Difficult ) const
{ {
int iMeterLow, iMeterHigh; int iMeterLow, iMeterHigh;
GetMeterRange(ci[c], iMeterLow, iMeterHigh ); GetMeterRange(ci[c], iMeterLow, iMeterHigh );
fTotalMeter += int( (iMeterLow + iMeterHigh) / 2.0f ); fTotalMeter += (iMeterLow + iMeterHigh) / 2.0f;
break; break;
} }
case DIFFICULTY_BEGINNER: fTotalMeter += 1; break; case DIFFICULTY_BEGINNER: fTotalMeter += 1; break;
@@ -122,7 +125,7 @@ int Course::GetMeter( int Difficult ) const
else else
fTotalMeter += ci[c].pNotes->GetMeter(); fTotalMeter += ci[c].pNotes->GetMeter();
} }
return (int)roundf( fTotalMeter / ci.size() ); return fTotalMeter / ci.size();
} }
void Course::LoadFromCRSFile( CString sPath ) void Course::LoadFromCRSFile( CString sPath )
@@ -843,15 +846,8 @@ static bool CompareCoursePointersByDifficulty(const Course* pCourse1, const Cour
static bool CompareCoursePointersByAvgDifficulty(const Course* pCourse1, const Course* pCourse2) static bool CompareCoursePointersByAvgDifficulty(const Course* pCourse1, const Course* pCourse2)
{ {
// GLENN: we must use the member variable because getmeter float fNum1 = pCourse1->GetMeter( false );
// returns an int, and a loss of precision occurs when that float fNum2 = pCourse2->GetMeter( false );
// happens. Anyways, we already have this variable
// from updatecoursestats.
// Plus players best/courses with randomo courses should
// go at the end.
float fNum1 = pCourse1->SortOrder_AvgDifficulty;
float fNum2 = pCourse2->SortOrder_AvgDifficulty;
if( fNum1 < fNum2 ) if( fNum1 < fNum2 )
return true; return true;
stepmania/src/Course.h
+1 -1
View File
@@ -117,7 +117,7 @@ public:
bool IsOni() const { return GetPlayMode() == PLAY_MODE_ONI; } bool IsOni() const { return GetPlayMode() == PLAY_MODE_ONI; }
bool IsEndless() const { return GetPlayMode() == PLAY_MODE_ENDLESS; } bool IsEndless() const { return GetPlayMode() == PLAY_MODE_ENDLESS; }
PlayMode GetPlayMode() const; PlayMode GetPlayMode() const;
int GetMeter( int Difficult = -1 ) const; float GetMeter( int Difficult = -1 ) const;
void LoadFromCRSFile( CString sPath ); void LoadFromCRSFile( CString sPath );
void Save(); void Save();
stepmania/src/DifficultyMeter.cpp
+1 -1
View File
@@ -57,7 +57,7 @@ void DifficultyMeter::SetFromCourse( Course* pCourse )
return; return;
} }
int meter = pCourse->GetMeter(); int meter = (int) roundf(pCourse->GetMeter());
SetMeter( meter ); SetMeter( meter );
// XXX // XXX