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

GetDifficulty and GetMeterRange take an Info.

Browse Source
This commit is contained in:
Glenn Maynard
2003-07-21 22:21:03 +00:00
parent a0230f752a
commit fb0b6ed89e
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Course.cpp
+8 -2
View File
@@ -585,9 +585,9 @@ RageColor Course::GetColor() const
} }
Difficulty Course::GetDifficulty( int stage ) const Difficulty Course::GetDifficulty( const Info &stage ) const
{ {
Difficulty dc = m_entries[stage].difficulty; Difficulty dc = m_entries[stage.CourseIndex].difficulty;
if(GAMESTATE->m_bDifficultCourses && dc < DIFFICULTY_CHALLENGE) if(GAMESTATE->m_bDifficultCourses && dc < DIFFICULTY_CHALLENGE)
dc = Difficulty(dc + 1); dc = Difficulty(dc + 1);
@@ -608,6 +608,12 @@ void Course::GetMeterRange( int stage, int& iMeterLowOut, int& iMeterHighOut ) c
} }
} }
void Course::GetMeterRange( const Info &stage, int& iMeterLowOut, int& iMeterHighOut ) const
{
GetMeterRange( stage.CourseIndex, iMeterLowOut, iMeterHighOut );
}
bool Course::GetTotalSeconds( float& fSecondsOut ) const bool Course::GetTotalSeconds( float& fSecondsOut ) const
{ {
vector<Info> ci; vector<Info> ci;
stepmania/src/Course.h
+3 -2
View File
@@ -86,8 +86,8 @@ public:
CString& sModifiersOut, CString& sModifiersOut,
NotesType nt ) const; NotesType nt ) const;
RageColor GetColor() const; RageColor GetColor() const;
Difficulty GetDifficulty( int stage ) const; Difficulty GetDifficulty( const Info &stage ) const;
void GetMeterRange( int stage, int& iMeterLowOut, int& iMeterHighOut ) const; void GetMeterRange( const Info &stage, int& iMeterLowOut, int& iMeterHighOut ) const;
bool GetTotalSeconds( float& fSecondsOut ) const; bool GetTotalSeconds( float& fSecondsOut ) const;
bool IsNonstop() const { return !m_bRepeat && m_iLives <= 0; } // use bar life meter bool IsNonstop() const { return !m_bRepeat && m_iLives <= 0; } // use bar life meter
@@ -122,6 +122,7 @@ public:
private: private:
Song *FindSong(CString sGroup, CString sSong) const; Song *FindSong(CString sGroup, CString sSong) const;
void SetDefaultScore(); void SetDefaultScore();
void GetMeterRange( int stage, int& iMeterLowOut, int& iMeterHighOut ) const;
}; };
stepmania/src/CourseContentsList.cpp
+2 -2
View File
@@ -63,9 +63,9 @@ void CourseContentsList::SetFromCourse( Course* pCourse )
if( ci[i].Random ) if( ci[i].Random )
{ {
Difficulty dc = pCourse->GetDifficulty(i); Difficulty dc = pCourse->GetDifficulty( ci[i] );
int iMeterLow, iMeterHigh; int iMeterLow, iMeterHigh;
pCourse->GetMeterRange(i, iMeterLow, iMeterHigh); pCourse->GetMeterRange(ci[i], iMeterLow, iMeterHigh);
if( dc == DIFFICULTY_INVALID ) if( dc == DIFFICULTY_INVALID )
display.LoadFromMeterRange( m_iNumContents+1, iMeterLow, iMeterHigh, ci[i].Modifiers ); display.LoadFromMeterRange( m_iNumContents+1, iMeterLow, iMeterHigh, ci[i].Modifiers );