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:
@@ -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 );
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user