m_iStagesForSong -> m_iMaxStagesForSong
This commit is contained in:
@@ -47,7 +47,7 @@ bool SongCriteria::Matches( const Song *pSong ) const
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if( m_iStagesForSong != -1 && SONGMAN->GetNumStagesForSong(pSong) != m_iStagesForSong )
|
if( m_iMaxStagesForSong != -1 && GAMESTATE->GetNumStagesForSong(pSong) > m_iMaxStagesForSong )
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
switch( m_Tutorial )
|
switch( m_Tutorial )
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ public:
|
|||||||
enum Selectable { Selectable_Yes, Selectable_No, Selectable_DontCare } m_Selectable;
|
enum Selectable { Selectable_Yes, Selectable_No, Selectable_DontCare } m_Selectable;
|
||||||
bool m_bUseSongAllowedList;
|
bool m_bUseSongAllowedList;
|
||||||
vector<Song*> m_vpSongAllowedList;
|
vector<Song*> m_vpSongAllowedList;
|
||||||
int m_iStagesForSong; // don't filter if -1
|
int m_iMaxStagesForSong; // don't filter if -1
|
||||||
enum Tutorial { Tutorial_Yes, Tutorial_No, Tutorial_DontCare } m_Tutorial;
|
enum Tutorial { Tutorial_Yes, Tutorial_No, Tutorial_DontCare } m_Tutorial;
|
||||||
enum Locked { Locked_Locked, Locked_Unlocked, Locked_DontCare } m_Locked;
|
enum Locked { Locked_Locked, Locked_Unlocked, Locked_DontCare } m_Locked;
|
||||||
|
|
||||||
@@ -29,7 +29,7 @@ public:
|
|||||||
m_bUseSongGenreAllowedList = false;
|
m_bUseSongGenreAllowedList = false;
|
||||||
m_Selectable = Selectable_DontCare;
|
m_Selectable = Selectable_DontCare;
|
||||||
m_bUseSongAllowedList = false;
|
m_bUseSongAllowedList = false;
|
||||||
m_iStagesForSong = -1;
|
m_iMaxStagesForSong = -1;
|
||||||
m_Tutorial = Tutorial_DontCare;
|
m_Tutorial = Tutorial_DontCare;
|
||||||
m_Locked = Locked_DontCare;
|
m_Locked = Locked_DontCare;
|
||||||
}
|
}
|
||||||
@@ -45,7 +45,7 @@ public:
|
|||||||
X(m_Selectable) &&
|
X(m_Selectable) &&
|
||||||
X(m_bUseSongAllowedList) &&
|
X(m_bUseSongAllowedList) &&
|
||||||
X(m_vpSongAllowedList) &&
|
X(m_vpSongAllowedList) &&
|
||||||
X(m_iStagesForSong) &&
|
X(m_iMaxStagesForSong) &&
|
||||||
X(m_Tutorial) &&
|
X(m_Tutorial) &&
|
||||||
X(m_Locked);
|
X(m_Locked);
|
||||||
#undef X
|
#undef X
|
||||||
|
|||||||
Reference in New Issue
Block a user