make start sound overridable

This commit is contained in:
Chris Danford
2004-12-04 21:16:00 +00:00
parent dbc256198a
commit 457f92f06a
2 changed files with 4 additions and 11 deletions
+3 -2
View File
@@ -194,8 +194,9 @@ ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sCl
m_bChosen[p] = false; m_bChosen[p] = false;
} }
m_soundChange.Load( THEME->GetPathToS( ssprintf("%s change", m_sName.c_str())), true ); m_soundChange.Load( THEME->GetPathToS( ssprintf("%s change", m_sName.c_str())) );
m_soundDifficult.Load( ANNOUNCER->GetPathTo("select difficulty challenge") ); m_soundDifficult.Load( ANNOUNCER->GetPathTo("select difficulty challenge") );
m_soundStart.Load( THEME->GetPathToS( ssprintf("%s start", m_sName.c_str())) );
// init m_Next order info // init m_Next order info
for( int dir = 0; dir < NUM_DIRS; ++dir ) for( int dir = 0; dir < NUM_DIRS; ++dir )
@@ -596,7 +597,7 @@ void ScreenSelectMaster::MenuStart( PlayerNumber pn )
GameCommand &mc = m_aGameCommands[m_iChoice[pn]]; GameCommand &mc = m_aGameCommands[m_iChoice[pn]];
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo(ssprintf("%s comment %s",m_sName.c_str(), mc.m_sName.c_str())) ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo(ssprintf("%s comment %s",m_sName.c_str(), mc.m_sName.c_str())) );
SCREENMAN->PlayStartSound(); m_soundStart.Play();
float fSecs = 0; float fSecs = 0;
bool bAllDone = true; bool bAllDone = true;
+1 -9
View File
@@ -71,6 +71,7 @@ protected:
RageSound m_soundChange; RageSound m_soundChange;
RandomSample m_soundDifficult; RandomSample m_soundDifficult;
RageSound m_soundStart;
int m_iChoice[NUM_PLAYERS]; int m_iChoice[NUM_PLAYERS];
bool m_bChosen[NUM_PLAYERS]; bool m_bChosen[NUM_PLAYERS];
@@ -78,15 +79,6 @@ protected:
float m_fLockInputSecs; float m_fLockInputSecs;
}; };
//
// Aliases
//
class ScreenSelectStyle5th : public ScreenSelectMaster
{
public:
ScreenSelectStyle5th( CString sName ): ScreenSelectMaster( sName ) { }
};
#endif #endif