[ScreenWithMenuElements] Add DelayMusicSeconds metric. requested in issue 540: http://ssc.ajworld.net/sm-ssc/bugtracker/view.php?id=540
This commit is contained in:
@@ -4,6 +4,10 @@ The StepMania 5 Changelog covers all post-sm-ssc changes. For a list of changes
|
||||
from StepMania 4 alpha 5 to sm-ssc v1.2.5, see Changelog_sm-ssc.txt.
|
||||
________________________________________________________________________________
|
||||
|
||||
2012/05/16
|
||||
----------
|
||||
* [ScreenWithMenuElements] Added DelayMusicSeconds metric.
|
||||
|
||||
2012/05/14
|
||||
----------
|
||||
* [Course] Added AllSongsAreFixed() Lua binding.
|
||||
|
||||
@@ -1578,6 +1578,7 @@ TimerSeconds=-1
|
||||
FirstUpdateCommand=
|
||||
PlayMusic=true
|
||||
MusicAlignBeat=true
|
||||
DelayMusicSeconds=0
|
||||
StopMusicOnBack=false
|
||||
WaitForChildrenBeforeTweeningOut=false
|
||||
CancelTransitionsOut=false
|
||||
|
||||
@@ -31,6 +31,7 @@ void ScreenWithMenuElements::Init()
|
||||
{
|
||||
PLAY_MUSIC.Load( m_sName, "PlayMusic" );
|
||||
MUSIC_ALIGN_BEAT.Load( m_sName, "MusicAlignBeat" );
|
||||
DELAY_MUSIC_SECONDS.Load( m_sName, "DelayMusicSeconds" );
|
||||
CANCEL_TRANSITIONS_OUT.Load( m_sName, "CancelTransitionsOut" );
|
||||
TIMER_SECONDS.Load( m_sName, "TimerSeconds" );
|
||||
TIMER_METRICS_GROUP.Load( m_sName, "TimerMetricsGroup" );
|
||||
@@ -217,7 +218,11 @@ void ScreenWithMenuElements::StartPlayingMusic()
|
||||
{
|
||||
pmp.sFile = sMusicPathFromLua;
|
||||
pmp.bAlignBeat = MUSIC_ALIGN_BEAT;
|
||||
|
||||
// TODO: load other params into pmp here -aj
|
||||
if( DELAY_MUSIC_SECONDS > 0.0f )
|
||||
pmp.fStartSecond = -DELAY_MUSIC_SECONDS;
|
||||
|
||||
SOUND->PlayMusic( pmp );
|
||||
}
|
||||
else
|
||||
@@ -238,6 +243,10 @@ void ScreenWithMenuElements::StartPlayingMusic()
|
||||
{
|
||||
pmp.sFile = m_sPathToMusic;
|
||||
pmp.bAlignBeat = MUSIC_ALIGN_BEAT;
|
||||
|
||||
if( DELAY_MUSIC_SECONDS > 0.0f )
|
||||
pmp.fStartSecond = -DELAY_MUSIC_SECONDS;
|
||||
|
||||
SOUND->PlayMusic( pmp );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -49,6 +49,7 @@ protected:
|
||||
|
||||
ThemeMetric<bool> PLAY_MUSIC;
|
||||
ThemeMetric<bool> MUSIC_ALIGN_BEAT;
|
||||
ThemeMetric<float> DELAY_MUSIC_SECONDS;
|
||||
ThemeMetric<bool> CANCEL_TRANSITIONS_OUT;
|
||||
ThemeMetric<float> TIMER_SECONDS;
|
||||
ThemeMetric<RString> TIMER_METRICS_GROUP;
|
||||
|
||||
Reference in New Issue
Block a user