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

add SampleMusicPreviewMode_LastSong, now that it works.

Browse Source 
There is a hack in there for playing the song associated with the Random option, based on Takuya's DDR Extreme theme having music for it. I am not sure if this is accurate behavior, though.
This commit is contained in:
AJ Kelly
2010-04-19 00:09:21 -05:00
parent 05cdd2ab95
commit 88f1da651c
3 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/GameConstantsAndTypes.cpp
+1 -1
View File
@@ -418,7 +418,7 @@ static const char *SampleMusicPreviewModeNames[] = {
"Normal",
//"StartToPreview",
"ScreenMusic",
//"LastSong"
"LastSong"
};
XToString( SampleMusicPreviewMode );
StringToX( SampleMusicPreviewMode );
src/GameConstantsAndTypes.h
+1 -1
View File
@@ -463,7 +463,7 @@ enum SampleMusicPreviewMode
SampleMusicPreviewMode_Normal,
//SampleMusicPreviewMode_StartToPreview,
SampleMusicPreviewMode_ScreenMusic,
//SampleMusicPreviewMode_LastSong, // continue playing the last song
SampleMusicPreviewMode_LastSong, // continue playing the last song
NUM_SampleMusicPreviewMode,
SampleMusicPreviewMode_Invalid,
};
src/ScreenSelectMusic.cpp
+26 -12
View File
@@ -1457,7 +1457,10 @@ void ScreenSelectMusic::AfterMusicChange()
vector<RString> m_Artists, m_AltArtists;
m_sSampleMusicToPlay = "";
if( SAMPLE_MUSIC_PREVIEW_MODE != SampleMusicPreviewMode_LastSong )
{
m_sSampleMusicToPlay = "";
}
m_pSampleMusicTimingData = NULL;
g_sCDTitlePath = "";
g_sBannerPath = "";
@@ -1482,30 +1485,40 @@ void ScreenSelectMusic::AfterMusicChange()
g_sCDTitlePath = ""; // none
//if( SAMPLE_MUSIC_PREVIEW_MODE != SampleMusicPreviewMode_LastSong )
//{
m_fSampleStartSeconds = 0;
m_fSampleLengthSeconds = -1;
//}
if( SAMPLE_MUSIC_PREVIEW_MODE != SampleMusicPreviewMode_LastSong )
{
m_fSampleStartSeconds = 0;
m_fSampleLengthSeconds = -1;
}
else
{
// HACK: Make random music work in LastSong mode (IDK if this is
// accurate or not) -aj
if( m_sSampleMusicToPlay == m_sRandomMusicPath )
{
m_fSampleStartSeconds = 0;
m_fSampleLengthSeconds = -1;
}
}
switch( m_MusicWheel.GetSelectedType() )
{
case TYPE_SECTION:
g_sBannerPath = SONGMAN->GetSongGroupBannerPath( m_MusicWheel.GetSelectedSection() );
//if( SAMPLE_MUSIC_PREVIEW_MODE != SampleMusicPreviewMode_LastSong )
m_sSampleMusicToPlay = m_sSectionMusicPath;
if( SAMPLE_MUSIC_PREVIEW_MODE != SampleMusicPreviewMode_LastSong )
m_sSampleMusicToPlay = m_sSectionMusicPath;
break;
case TYPE_SORT:
bWantBanner = false; // we load it ourself
m_Banner.LoadMode();
//if( SAMPLE_MUSIC_PREVIEW_MODE != SampleMusicPreviewMode_LastSong )
m_sSampleMusicToPlay = m_sSortMusicPath;
if( SAMPLE_MUSIC_PREVIEW_MODE != SampleMusicPreviewMode_LastSong )
m_sSampleMusicToPlay = m_sSortMusicPath;
break;
case TYPE_ROULETTE:
bWantBanner = false; // we load it ourself
m_Banner.LoadRoulette();
//if( SAMPLE_MUSIC_PREVIEW_MODE != SampleMusicPreviewMode_LastSong )
m_sSampleMusicToPlay = m_sRouletteMusicPath;
if( SAMPLE_MUSIC_PREVIEW_MODE != SampleMusicPreviewMode_LastSong )
m_sSampleMusicToPlay = m_sRouletteMusicPath;
break;
case TYPE_RANDOM:
bWantBanner = false; // we load it ourself
@@ -1542,6 +1555,7 @@ void ScreenSelectMusic::AfterMusicChange()
// we want to load the sample music, but we don't want to
// actually play it; fall through for now. -aj
case SampleMusicPreviewMode_Normal:
case SampleMusicPreviewMode_LastSong: // fall through
// play the sample music
m_sSampleMusicToPlay = pSong->GetMusicPath();
m_pSampleMusicTimingData = &pSong->m_Timing;