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

use IsMarathon, IsLong

Browse Source
This commit is contained in:
Glenn Maynard
2006-08-17 00:37:40 +00:00
parent ba7d8d2849
commit 982ffa6a65
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEz2SelectMusic.cpp
+2 -2
View File
@@ -606,13 +606,13 @@ void ScreenEz2SelectMusic::MusicChanged()
m_CurrentSubTitle.SetText( pSong->m_sSubTitle, ""); m_CurrentSubTitle.SetText( pSong->m_sSubTitle, "");
m_CurrentArtist.SetText( pSong->m_sArtist, ""); m_CurrentArtist.SetText( pSong->m_sArtist, "");
if( pSong->m_fMusicLengthSeconds > PREFSMAN->m_fMarathonVerSongSeconds ) if( pSong->IsMarathon() )
{ {
m_sprBalloon.StopTweening(); m_sprBalloon.StopTweening();
m_sprBalloon.Load( THEME->GetPathG("ScreenSelectMusic","balloon marathon") ); m_sprBalloon.Load( THEME->GetPathG("ScreenSelectMusic","balloon marathon") );
SET_XY_AND_ON_COMMAND( m_sprBalloon ); SET_XY_AND_ON_COMMAND( m_sprBalloon );
} }
else if( pSong->m_fMusicLengthSeconds > PREFSMAN->m_fLongVerSongSeconds ) else if( pSong->IsLong() )
{ {
m_sprBalloon.StopTweening(); m_sprBalloon.StopTweening();
m_sprBalloon.Load( THEME->GetPathG("ScreenSelectMusic","balloon long") ); m_sprBalloon.Load( THEME->GetPathG("ScreenSelectMusic","balloon long") );
stepmania/src/SongManager.cpp
+2 -2
View File
@@ -649,9 +649,9 @@ RString SongManager::ShortenGroupName( RString sLongGroupName )
int SongManager::GetNumStagesForSong( const Song* pSong ) int SongManager::GetNumStagesForSong( const Song* pSong )
{ {
ASSERT( pSong ); ASSERT( pSong );
if( pSong->m_fMusicLengthSeconds > PREFSMAN->m_fMarathonVerSongSeconds ) if( pSong->IsMarathon() )
return 3; return 3;
if( pSong->m_fMusicLengthSeconds > PREFSMAN->m_fLongVerSongSeconds ) if( pSong->IsLong() )
return 2; return 2;
else else
return 1; return 1;