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

oops, forgot to commit:

Browse Source 
replace GAMESTATE->m_pUnlockingSys with UNLOCKSYS
This commit is contained in:
Andrew Wong
2003-09-19 07:02:53 +00:00
parent 79c2560527
commit 54e490fd20
11 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MusicWheel.cpp
+4 -4
View File
@@ -335,12 +335,12 @@ void MusicWheel::GetSongList(vector<Song*> &arraySongs, SongSortOrder so, CStrin
if( so!=SORT_ROULETTE && !pSong->NormallyDisplayed() )
continue;
if( so==SORT_ROULETTE && !(pSong->RouletteDisplayed()
|| GAMESTATE->m_pUnlockingSys->SongIsRoulette( pSong )) )
|| UNLOCKSYS->SongIsRoulette( pSong )) )
continue;
}
// If we're using unlocks, check it here to prevent from being shown
if( so!=SORT_ROULETTE && GAMESTATE->m_pUnlockingSys->SongIsLocked(pSong) )
if( so!=SORT_ROULETTE && UNLOCKSYS->SongIsLocked(pSong) )
continue;
vector<Steps*> arraySteps;
@@ -625,7 +625,7 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
Course* pCourse = apCourses[c];
// if unlocks are on, make sure it is unlocked
if ( GAMESTATE->m_pUnlockingSys->CourseIsLocked(pCourse) )
if ( UNLOCKSYS->CourseIsLocked(pCourse) )
continue;
CString sThisSection = "";
@@ -1203,7 +1203,7 @@ bool MusicWheel::Select() // return true if this selection ends the screen
return false;
case TYPE_SONG:
if (PREFSMAN->m_bUseUnlockSystem)
GAMESTATE->m_pUnlockingSys->RouletteUnlock( m_CurWheelItemData[m_iSelection]->m_pSong );
UNLOCKSYS->RouletteUnlock( m_CurWheelItemData[m_iSelection]->m_pSong );
// fall-through - we want to check for unlocking only if its a song
case TYPE_COURSE:
return true;