Implement preview music properly as a new optional tag in the ssc file. Changed ScreenManager to emit an error instead of asserting if a screen attempts to use SetNewScreen inside an InitCommand. Changed decorations layer to be a proper child instead of stripping away the ActorFrame.

This commit is contained in:
Kyzentun
2015-03-04 01:31:02 -07:00
parent 519ad8d243
commit 0318f07d2d
16 changed files with 88 additions and 30 deletions
+2 -2
View File
@@ -548,10 +548,10 @@ void ScreenNetSelectMusic::MusicChanged()
{
SOUND->StopMusic();
SOUND->PlayMusic(
GAMESTATE->m_pCurSong->GetMusicPath(),
GAMESTATE->m_pCurSong->GetPreviewMusicPath(),
NULL,
true,
GAMESTATE->m_pCurSong->m_fMusicSampleStartSeconds,
GAMESTATE->m_pCurSong->GetPreviewStartSeconds(),
GAMESTATE->m_pCurSong->m_fMusicSampleLengthSeconds );
}
}