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

Sprite -> AutoActor

Browse Source
This commit is contained in:
Chris Danford
2005-03-30 17:43:34 +00:00
parent 47aaf5a0eb
commit 79fa333e91
2 changed files with 45 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMusic.cpp
+43 -24
View File
@@ -92,8 +92,6 @@ void ScreenSelectMusic::Init()
m_sRandomMusicPath = THEME->GetPathS(m_sName,"random music"); m_sRandomMusicPath = THEME->GetPathS(m_sName,"random music");
m_sCourseMusicPath = THEME->GetPathS(m_sName,"course music"); m_sCourseMusicPath = THEME->GetPathS(m_sName,"course music");
m_sFallbackCDTitlePath = THEME->GetPathG(m_sName,"fallback cdtitle"); m_sFallbackCDTitlePath = THEME->GetPathG(m_sName,"fallback cdtitle");
m_sBalloonMarathonPath = THEME->GetPathG(m_sName,"balloon marathon");
m_sBalloonLongPath = THEME->GetPathG(m_sName,"balloon long");
TEXTUREMAN->CacheTexture( m_sFallbackCDTitlePath ); TEXTUREMAN->CacheTexture( m_sFallbackCDTitlePath );
@@ -244,6 +242,7 @@ void ScreenSelectMusic::Init()
if( SHOW_COURSE_CONTENTS ) if( SHOW_COURSE_CONTENTS )
{ {
m_CourseContents.SetName( "CourseContents" ); m_CourseContents.SetName( "CourseContents" );
m_CourseContents.Load();
SET_XY( m_CourseContents ); SET_XY( m_CourseContents );
this->AddChild( &m_CourseContents ); this->AddChild( &m_CourseContents );
} }
@@ -311,10 +310,15 @@ void ScreenSelectMusic::Init()
SET_XY( m_MusicSortDisplay ); SET_XY( m_MusicSortDisplay );
this->AddChild( &m_MusicSortDisplay ); this->AddChild( &m_MusicSortDisplay );
m_sprBalloon.SetName( "Balloon" ); m_sprLongBalloon.Load( THEME->GetPathG(m_sName,"balloon long") );
TEXTUREMAN->CacheTexture( THEME->GetPathG(m_sName,"balloon long") ); m_sprLongBalloon->SetName( "Balloon" );
TEXTUREMAN->CacheTexture( THEME->GetPathG(m_sName,"balloon marathon") ); m_sprLongBalloon->SetHidden( 1 );
this->AddChild( &m_sprBalloon ); this->AddChild( m_sprLongBalloon );
m_sprMarathonBalloon.Load( THEME->GetPathG(m_sName,"balloon marathon") );
m_sprMarathonBalloon->SetName( "Balloon" );
m_sprMarathonBalloon->SetHidden( 1 );
this->AddChild( m_sprMarathonBalloon );
m_sprCourseHasMods.LoadAndSetName( m_sName, "CourseHasMods" ); m_sprCourseHasMods.LoadAndSetName( m_sName, "CourseHasMods" );
SET_XY( m_sprCourseHasMods ); SET_XY( m_sprCourseHasMods );
@@ -536,7 +540,8 @@ 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_sprLongBalloon );
ON_COMMAND( m_sprMarathonBalloon );
ON_COMMAND( m_sprCourseHasMods ); ON_COMMAND( m_sprCourseHasMods );
ON_COMMAND( m_MusicWheel ); ON_COMMAND( m_MusicWheel );
ON_COMMAND( m_Artist ); ON_COMMAND( m_Artist );
@@ -591,7 +596,8 @@ void ScreenSelectMusic::TweenOffScreen()
m_MusicWheel.TweenOffScreen(); m_MusicWheel.TweenOffScreen();
OFF_COMMAND( m_MusicWheelUnder ); OFF_COMMAND( m_MusicWheelUnder );
OFF_COMMAND( m_MusicWheel ); OFF_COMMAND( m_MusicWheel );
OFF_COMMAND( m_sprBalloon ); OFF_COMMAND( m_sprLongBalloon );
OFF_COMMAND( m_sprMarathonBalloon );
OFF_COMMAND( m_sprCourseHasMods ); OFF_COMMAND( m_sprCourseHasMods );
OFF_COMMAND( m_Artist ); OFF_COMMAND( m_Artist );
OFF_COMMAND( m_MachineRank ); OFF_COMMAND( m_MachineRank );
@@ -1520,8 +1526,10 @@ void ScreenSelectMusic::AfterMusicChange()
ASSERT(0); ASSERT(0);
} }
m_sprBalloon.StopTweening(); m_sprLongBalloon->StopTweening();
COMMAND( m_sprBalloon, "Hide" ); COMMAND( m_sprLongBalloon, "Hide" );
m_sprMarathonBalloon->StopTweening();
COMMAND( m_sprMarathonBalloon, "Hide" );
m_sprCourseHasMods->StopTweening(); m_sprCourseHasMods->StopTweening();
COMMAND( m_sprCourseHasMods, "Hide" ); COMMAND( m_sprCourseHasMods, "Hide" );
@@ -1587,22 +1595,29 @@ void ScreenSelectMusic::AfterMusicChange()
* like the effect with a lot of delay. */ * like the effect with a lot of delay. */
if( pSong->m_fMusicLengthSeconds > PREFSMAN->m_fMarathonVerSongSeconds ) if( pSong->m_fMusicLengthSeconds > PREFSMAN->m_fMarathonVerSongSeconds )
{ {
m_sprBalloon.StopTweening(); m_sprMarathonBalloon->StopTweening();
m_sprBalloon.Load( m_sBalloonMarathonPath ); SET_XY( m_sprMarathonBalloon );
SET_XY( m_sprBalloon ); COMMAND( m_sprMarathonBalloon, "Show" );
COMMAND( m_sprBalloon, "Show" );
m_sprLongBalloon->StopTweening();
COMMAND( m_sprLongBalloon, "Hide" );
} }
else if( pSong->m_fMusicLengthSeconds > PREFSMAN->m_fLongVerSongSeconds ) else if( pSong->m_fMusicLengthSeconds > PREFSMAN->m_fLongVerSongSeconds )
{ {
m_sprBalloon.StopTweening(); m_sprLongBalloon->StopTweening();
m_sprBalloon.Load( m_sBalloonLongPath ); SET_XY( m_sprLongBalloon );
SET_XY( m_sprBalloon ); COMMAND( m_sprLongBalloon, "Show" );
COMMAND( m_sprBalloon, "Show" );
m_sprMarathonBalloon->StopTweening();
COMMAND( m_sprMarathonBalloon, "Hide" );
} }
else else
{ {
m_sprBalloon.StopTweening(); m_sprLongBalloon->StopTweening();
COMMAND( m_sprBalloon, "Hide" ); COMMAND( m_sprLongBalloon, "Hide" );
m_sprMarathonBalloon->StopTweening();
COMMAND( m_sprMarathonBalloon, "Hide" );
} }
m_sprCourseHasMods->StopTweening(); m_sprCourseHasMods->StopTweening();
@@ -1645,8 +1660,10 @@ void ScreenSelectMusic::AfterMusicChange()
ASSERT(0); ASSERT(0);
} }
m_sprBalloon.StopTweening(); m_sprLongBalloon->StopTweening();
COMMAND( m_sprBalloon, "Hide" ); COMMAND( m_sprLongBalloon, "Hide" );
m_sprMarathonBalloon->StopTweening();
COMMAND( m_sprMarathonBalloon, "Hide" );
m_sprCourseHasMods->StopTweening(); m_sprCourseHasMods->StopTweening();
COMMAND( m_sprCourseHasMods, "Hide" ); COMMAND( m_sprCourseHasMods, "Hide" );
@@ -1706,8 +1723,10 @@ void ScreenSelectMusic::AfterMusicChange()
m_sprBalloon.StopTweening(); m_sprLongBalloon->StopTweening();
COMMAND( m_sprBalloon, "Hide" ); COMMAND( m_sprLongBalloon, "Hide" );
m_sprMarathonBalloon->StopTweening();
COMMAND( m_sprMarathonBalloon, "Hide" );
if( pCourse->HasMods() ) if( pCourse->HasMods() )
{ {
stepmania/src/ScreenSelectMusic.h
+2 -3
View File
@@ -93,8 +93,6 @@ protected:
CString m_sRandomMusicPath; CString m_sRandomMusicPath;
CString m_sCourseMusicPath; CString m_sCourseMusicPath;
CString m_sFallbackCDTitlePath; CString m_sFallbackCDTitlePath;
CString m_sBalloonMarathonPath;
CString m_sBalloonLongPath;
Sprite m_sprCharacterIcon[NUM_PLAYERS]; Sprite m_sprCharacterIcon[NUM_PLAYERS];
Sprite m_sprBannerMask; Sprite m_sprBannerMask;
@@ -121,7 +119,8 @@ protected:
BitmapText m_textHighScore[NUM_PLAYERS]; BitmapText m_textHighScore[NUM_PLAYERS];
MusicWheel m_MusicWheel; MusicWheel m_MusicWheel;
AutoActor m_MusicWheelUnder; AutoActor m_MusicWheelUnder;
Sprite m_sprBalloon; AutoActor m_sprLongBalloon;
AutoActor m_sprMarathonBalloon;
AutoActor m_sprCourseHasMods; AutoActor m_sprCourseHasMods;
DifficultyDisplay m_DifficultyDisplay; DifficultyDisplay m_DifficultyDisplay;
DifficultyList m_DifficultyList; DifficultyList m_DifficultyList;