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

Split balloon commands into On, Off, Show, Hide

Browse Source
This commit is contained in:
Chris Danford
2004-05-29 05:35:13 +00:00
parent 2fab068fe4
commit d4eaab5ad4
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+2
View File
@@ -751,6 +751,8 @@ BalloonX=392
BalloonY=140 BalloonY=140
BalloonOnCommand=linear,0.2;zoomy,1;bob;effectmagnitude,0,10,0 BalloonOnCommand=linear,0.2;zoomy,1;bob;effectmagnitude,0,10,0
BalloonOffCommand=linear,0.2;zoomy,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= CourseHasModsX=
CourseHasModsY= CourseHasModsY=
CourseHasModsOffCommand= CourseHasModsOffCommand=
stepmania/src/ScreenSelectMusic.cpp
+9 -6
View File
@@ -530,6 +530,7 @@ void ScreenSelectMusic::TweenOnScreen()
ON_COMMAND( m_MusicSortDisplay ); ON_COMMAND( m_MusicSortDisplay );
ON_COMMAND( m_MusicWheelUnder ); ON_COMMAND( m_MusicWheelUnder );
m_MusicWheel.TweenOnScreen(); m_MusicWheel.TweenOnScreen();
ON_COMMAND( m_sprBalloon );
ON_COMMAND( m_MusicWheel ); ON_COMMAND( m_MusicWheel );
ON_COMMAND( m_Artist ); ON_COMMAND( m_Artist );
ON_COMMAND( m_MachineRank ); ON_COMMAND( m_MachineRank );
@@ -1356,7 +1357,7 @@ void ScreenSelectMusic::AfterMusicChange()
} }
m_sprBalloon.StopTweening(); m_sprBalloon.StopTweening();
OFF_COMMAND( m_sprBalloon ); COMMAND( m_sprBalloon, "Hide" );
m_sprCourseHasMods->StopTweening(); m_sprCourseHasMods->StopTweening();
OFF_COMMAND( m_sprCourseHasMods ); OFF_COMMAND( m_sprCourseHasMods );
@@ -1413,18 +1414,20 @@ void ScreenSelectMusic::AfterMusicChange()
{ {
m_sprBalloon.StopTweening(); m_sprBalloon.StopTweening();
m_sprBalloon.Load( THEME->GetPathG(m_sName,"balloon marathon") ); 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 ) else if( pSong->m_fMusicLengthSeconds > PREFSMAN->m_fLongVerSongSeconds )
{ {
m_sprBalloon.StopTweening(); m_sprBalloon.StopTweening();
m_sprBalloon.Load( THEME->GetPathG(m_sName,"balloon long") ); 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 else
{ {
m_sprBalloon.StopTweening(); m_sprBalloon.StopTweening();
OFF_COMMAND( m_sprBalloon ); COMMAND( m_sprBalloon, "Hide" );
} }
m_sprCourseHasMods->StopTweening(); m_sprCourseHasMods->StopTweening();
@@ -1472,7 +1475,7 @@ void ScreenSelectMusic::AfterMusicChange()
} }
m_sprBalloon.StopTweening(); m_sprBalloon.StopTweening();
OFF_COMMAND( m_sprBalloon ); COMMAND( m_sprBalloon, "Hide" );
m_sprCourseHasMods->StopTweening(); m_sprCourseHasMods->StopTweening();
OFF_COMMAND( m_sprCourseHasMods ); OFF_COMMAND( m_sprCourseHasMods );
@@ -1522,7 +1525,7 @@ void ScreenSelectMusic::AfterMusicChange()
m_sprBalloon.StopTweening(); m_sprBalloon.StopTweening();
OFF_COMMAND( m_sprBalloon ); COMMAND( m_sprBalloon, "Hide" );
if( pCourse->HasMods() ) if( pCourse->HasMods() )
{ {