From b407c5817659f0ebcc4cf7d7f3df46266716c7bd Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Fri, 23 Feb 2007 19:31:42 +0000 Subject: [PATCH] m_iStagesForSong -> m_iMaxStagesForSong --- stepmania/src/SongUtil.cpp | 2 +- stepmania/src/SongUtil.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/SongUtil.cpp b/stepmania/src/SongUtil.cpp index 92a63ff614..09d77574d2 100644 --- a/stepmania/src/SongUtil.cpp +++ b/stepmania/src/SongUtil.cpp @@ -47,7 +47,7 @@ bool SongCriteria::Matches( const Song *pSong ) const return false; } - if( m_iStagesForSong != -1 && SONGMAN->GetNumStagesForSong(pSong) != m_iStagesForSong ) + if( m_iMaxStagesForSong != -1 && GAMESTATE->GetNumStagesForSong(pSong) > m_iMaxStagesForSong ) return false; switch( m_Tutorial ) diff --git a/stepmania/src/SongUtil.h b/stepmania/src/SongUtil.h index 6bbe25511c..b4141be3fa 100644 --- a/stepmania/src/SongUtil.h +++ b/stepmania/src/SongUtil.h @@ -20,7 +20,7 @@ public: enum Selectable { Selectable_Yes, Selectable_No, Selectable_DontCare } m_Selectable; bool m_bUseSongAllowedList; vector 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 Locked { Locked_Locked, Locked_Unlocked, Locked_DontCare } m_Locked; @@ -29,7 +29,7 @@ public: m_bUseSongGenreAllowedList = false; m_Selectable = Selectable_DontCare; m_bUseSongAllowedList = false; - m_iStagesForSong = -1; + m_iMaxStagesForSong = -1; m_Tutorial = Tutorial_DontCare; m_Locked = Locked_DontCare; } @@ -45,7 +45,7 @@ public: X(m_Selectable) && X(m_bUseSongAllowedList) && X(m_vpSongAllowedList) && - X(m_iStagesForSong) && + X(m_iMaxStagesForSong) && X(m_Tutorial) && X(m_Locked); #undef X