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

fix attract sounds play when they shouldn't if two ScreenDemonstrations in a row

Browse Source
This commit is contained in:
Chris Danford
2005-06-15 02:01:09 +00:00
parent 64690cdb40
commit 9c59962805
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenDemonstration.cpp
-6
View File
@@ -53,10 +53,6 @@ void ScreenDemonstration::Init()
GAMESTATE->m_PlayMode = PLAY_MODE_REGULAR;
/* If needed, turn sound off. */
if( !GAMESTATE->IsTimeToPlayAttractSounds() )
SOUNDMAN->SetPrefs( 0 ); // silent
ScreenJukebox::Init();
if( GAMESTATE->m_pCurSong == NULL ) // we didn't find a song.
@@ -87,8 +83,6 @@ void ScreenDemonstration::HandleScreenMessage( const ScreenMessage SM )
}
else if( SM == SM_GainFocus )
{
if( !GAMESTATE->IsTimeToPlayAttractSounds() )
SOUNDMAN->SetPrefs( 0 ); // silent
}
else if( SM == SM_LoseFocus )
{
stepmania/src/ScreenGameplay.cpp
+4 -1
View File
@@ -1131,6 +1131,9 @@ float ScreenGameplay::StartPlayingSong(float MinTimeToNotes, float MinTimeToMusi
p.StopMode = RageSoundParams::M_CONTINUE;
p.m_StartSecond = fStartSecond;
// Silence music if not playing attract sounds in demonstration.
p.m_Volume = (!GAMESTATE->m_bDemonstrationOrJukebox || GAMESTATE->IsTimeToPlayAttractSounds()) ? 1 : 0;
ASSERT( !m_pSoundMusic->IsPlaying() );
m_pSoundMusic->Play( &p );
if( m_bPaused )
@@ -2080,7 +2083,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
float fFadeLengthSeconds = MUSIC_FADE_OUT_SECONDS;
RageSoundParams p = m_pSoundMusic->GetParams();
p.m_FadeLength = fFadeLengthSeconds;
p.m_LengthSeconds = GAMESTATE->m_fMusicSeconds + fFadeLengthSeconds;
p.m_LengthSeconds = GAMESTATE->m_fMusicSeconds + fFadeLengthSeconds;
m_pSoundMusic->SetParams(p);
SCREENMAN->PostMessageToTopScreen( SM_StartLoadingNextSong, fFadeLengthSeconds );
return;