On SelectDifficulty the "This mode is difficult" sound plays every switch from page 1 to page 2, not just the first time.
This commit is contained in:
@@ -168,8 +168,7 @@ ScreenSelectDifficulty::ScreenSelectDifficulty()
|
|||||||
|
|
||||||
m_soundChange.Load( THEME->GetPathTo("Sounds", "select difficulty change") );
|
m_soundChange.Load( THEME->GetPathTo("Sounds", "select difficulty change") );
|
||||||
m_soundSelect.Load( THEME->GetPathTo("Sounds", "menu start") );
|
m_soundSelect.Load( THEME->GetPathTo("Sounds", "menu start") );
|
||||||
|
m_soundDifficult.Load( ANNOUNCER->GetPathTo("select difficulty challenge") );
|
||||||
m_bPlayedChallengeSound = false;
|
|
||||||
|
|
||||||
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select difficulty intro") );
|
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select difficulty intro") );
|
||||||
|
|
||||||
@@ -346,10 +345,10 @@ void ScreenSelectDifficulty::ChangeTo( PlayerNumber pn, int iSelectionWas, int i
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if( !m_bPlayedChallengeSound && bChangedPagesFrom1To2 )
|
if( bChangedPagesFrom1To2 )
|
||||||
{
|
{
|
||||||
SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select difficulty challenge") );
|
m_soundDifficult.Stop();
|
||||||
m_bPlayedChallengeSound = true;
|
m_soundDifficult.PlayRandom();
|
||||||
}
|
}
|
||||||
|
|
||||||
if( bChangedPagesFrom1To2 || bChangedPagesFrom2To1 )
|
if( bChangedPagesFrom1To2 || bChangedPagesFrom2To1 )
|
||||||
|
|||||||
@@ -15,6 +15,7 @@
|
|||||||
#include "Screen.h"
|
#include "Screen.h"
|
||||||
#include "Quad.h"
|
#include "Quad.h"
|
||||||
#include "MenuElements.h"
|
#include "MenuElements.h"
|
||||||
|
#include "RandomSample.h"
|
||||||
|
|
||||||
|
|
||||||
const int NUM_ITEMS_ON_PAGE_1 = 3; // easy, medium, hard,
|
const int NUM_ITEMS_ON_PAGE_1 = 3; // easy, medium, hard,
|
||||||
@@ -62,8 +63,7 @@ private:
|
|||||||
|
|
||||||
RageSoundSample m_soundChange;
|
RageSoundSample m_soundChange;
|
||||||
RageSoundSample m_soundSelect;
|
RageSoundSample m_soundSelect;
|
||||||
|
RandomSample m_soundDifficult;
|
||||||
bool m_bPlayedChallengeSound;
|
|
||||||
|
|
||||||
int m_iSelection[NUM_PLAYERS];
|
int m_iSelection[NUM_PLAYERS];
|
||||||
bool m_bChosen[NUM_PLAYERS];
|
bool m_bChosen[NUM_PLAYERS];
|
||||||
|
|||||||
Reference in New Issue
Block a user