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

Updated AnnoucerManager::GetPathTo to act like ThemeManager. More theme and Ez2 cleanup.

Browse Source
This commit is contained in:
Chris Danford
2002-08-27 23:31:41 +00:00
parent 307b50179a
commit 7922f5bbc7
70 changed files with 801 additions and 1256 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenMusicScroll.cpp
+8 -8
View File
@@ -22,7 +22,7 @@
const ScreenMessage SM_StartFadingOut = ScreenMessage(SM_User + 1);
const ScreenMessage SM_GoToNextState = ScreenMessage(SM_User + 2);
const ScreenMessage SM_GoToNextScreen = ScreenMessage(SM_User + 2);
const int LINE_GAP = 40;
@@ -144,7 +144,7 @@ ScreenMusicScroll::ScreenMusicScroll()
Song* pSong = arraySongs[i];
m_textLines[m_iNumLines].LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textLines[m_iNumLines].SetText( pSong->GetFullTitle() );
m_textLines[m_iNumLines].SetDiffuseColor( SONGMAN->GetGroupColor(pSong->m_sGroupName) );
m_textLines[m_iNumLines].SetDiffuseColor( SONGMAN->GetSongColor(pSong) );
m_iNumLines++;
}
@@ -171,7 +171,7 @@ ScreenMusicScroll::ScreenMusicScroll()
this->AddSubActor( &m_Fade );
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo(ANNOUNCER_MUSIC_SCROLL) );
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("music scroll") );
MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","music scroll music") );
@@ -221,20 +221,20 @@ void ScreenMusicScroll::HandleScreenMessage( const ScreenMessage SM )
switch( SM )
{
case SM_StartFadingOut:
m_Fade.CloseWipingRight( SM_GoToNextState );
m_Fade.CloseWipingRight( SM_GoToNextScreen );
break;
case SM_GoToNextState:
case SM_GoToNextScreen:
SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
break;
}
}
void ScreenMusicScroll::MenuStart( const PlayerNumber p )
void ScreenMusicScroll::MenuStart( PlayerNumber p )
{
m_Fade.CloseWipingRight( SM_GoToNextState );
m_Fade.CloseWipingRight( SM_GoToNextScreen );
}
void ScreenMusicScroll::MenuBack( const PlayerNumber p )
void ScreenMusicScroll::MenuBack( PlayerNumber p )
{
MenuStart( p );
}