From d4eaab5ad430378631ef5e55a7ba6105cbbc3660 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 29 May 2004 05:35:13 +0000 Subject: [PATCH] Split balloon commands into On, Off, Show, Hide --- stepmania/Themes/default/metrics.ini | 2 ++ stepmania/src/ScreenSelectMusic.cpp | 15 +++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index fd01e94fe1..91910159a5 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -751,6 +751,8 @@ BalloonX=392 BalloonY=140 BalloonOnCommand=linear,0.2;zoomy,1;bob;effectmagnitude,0,10,0 BalloonOffCommand=linear,0.2;zoomy,0 +BalloonShowCommand=linear,0.2;zoomy,1;bob;effectmagnitude,0,10,0 +BalloonHideCommand=linear,0.2;zoomy,0 CourseHasModsX= CourseHasModsY= CourseHasModsOffCommand= diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index dbb54d9504..2669b040ab 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -530,6 +530,7 @@ void ScreenSelectMusic::TweenOnScreen() ON_COMMAND( m_MusicSortDisplay ); ON_COMMAND( m_MusicWheelUnder ); m_MusicWheel.TweenOnScreen(); + ON_COMMAND( m_sprBalloon ); ON_COMMAND( m_MusicWheel ); ON_COMMAND( m_Artist ); ON_COMMAND( m_MachineRank ); @@ -1356,7 +1357,7 @@ void ScreenSelectMusic::AfterMusicChange() } m_sprBalloon.StopTweening(); - OFF_COMMAND( m_sprBalloon ); + COMMAND( m_sprBalloon, "Hide" ); m_sprCourseHasMods->StopTweening(); OFF_COMMAND( m_sprCourseHasMods ); @@ -1413,18 +1414,20 @@ void ScreenSelectMusic::AfterMusicChange() { m_sprBalloon.StopTweening(); m_sprBalloon.Load( THEME->GetPathG(m_sName,"balloon marathon") ); - SET_XY_AND_ON_COMMAND( m_sprBalloon ); + SET_XY( m_sprBalloon ); + COMMAND( m_sprBalloon, "Show" ); } else if( pSong->m_fMusicLengthSeconds > PREFSMAN->m_fLongVerSongSeconds ) { m_sprBalloon.StopTweening(); m_sprBalloon.Load( THEME->GetPathG(m_sName,"balloon long") ); - SET_XY_AND_ON_COMMAND( m_sprBalloon ); + SET_XY( m_sprBalloon ); + COMMAND( m_sprBalloon, "Show" ); } else { m_sprBalloon.StopTweening(); - OFF_COMMAND( m_sprBalloon ); + COMMAND( m_sprBalloon, "Hide" ); } m_sprCourseHasMods->StopTweening(); @@ -1472,7 +1475,7 @@ void ScreenSelectMusic::AfterMusicChange() } m_sprBalloon.StopTweening(); - OFF_COMMAND( m_sprBalloon ); + COMMAND( m_sprBalloon, "Hide" ); m_sprCourseHasMods->StopTweening(); OFF_COMMAND( m_sprCourseHasMods ); @@ -1522,7 +1525,7 @@ void ScreenSelectMusic::AfterMusicChange() m_sprBalloon.StopTweening(); - OFF_COMMAND( m_sprBalloon ); + COMMAND( m_sprBalloon, "Hide" ); if( pCourse->HasMods() ) {