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

Re-adding these; they were (incorrectly) added as binary files for some

Browse Source 
reason.

Fix include case, reduce dependencies on UnlockSystem.h, cleanup.
This commit is contained in:
Glenn Maynard
2003-07-07 22:21:31 +00:00
parent 0011ca5654
commit 03b4a7b6f3
10 changed files with 1286 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MusicWheel.cpp
+3 -2
View File
@@ -31,6 +31,7 @@
#include "RageTextureManager.h"
#include "Banner.h"
#include "Notes.h"
#include "UnlockSystem.h"
#define FADE_SECONDS THEME->GetMetricF("MusicWheel","FadeSeconds")
@@ -315,7 +316,7 @@ void MusicWheel::GetSongList(vector<Song*> &arraySongs, SongSortOrder so, CStrin
continue;
if( so==SORT_ROULETTE && !pSong->RouletteDisplayed() )
continue;
if( so==SORT_ROULETTE && GAMESTATE->UnlockingSys.SongIsRoulette( pSong->GetFullTranslitTitle() ) )
if( so==SORT_ROULETTE && GAMESTATE->m_pUnlockingSys->SongIsRoulette( pSong->GetFullTranslitTitle() ) )
continue;
}
@@ -327,7 +328,7 @@ void MusicWheel::GetSongList(vector<Song*> &arraySongs, SongSortOrder so, CStrin
// If we're using unlocks, check it here to prevent from being shown
if( PREFSMAN->m_bUseUnlockSystem )
{
pSong->m_bIsLocked = GAMESTATE->UnlockingSys.SongIsLocked( pSong->GetFullTranslitTitle() );
pSong->m_bIsLocked = GAMESTATE->m_pUnlockingSys->SongIsLocked( pSong->GetFullTranslitTitle() );
if( pSong->m_bIsLocked ) { continue; }
}
arraySongs.push_back( pSong );