do this with ActorSound
This commit is contained in:
@@ -56,10 +56,6 @@ void ScreenPlayerOptions::Init()
|
|||||||
m_bAcceptedChoices = false;
|
m_bAcceptedChoices = false;
|
||||||
m_bGoToOptions = ( PREFSMAN->m_ShowSongOptions == PrefsManager::YES );
|
m_bGoToOptions = ( PREFSMAN->m_ShowSongOptions == PrefsManager::YES );
|
||||||
|
|
||||||
RString sPath = THEME->GetPathS( m_sName,"cancel all", true );
|
|
||||||
if( sPath != "" )
|
|
||||||
m_CancelAll.Load( sPath, true );
|
|
||||||
|
|
||||||
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("player options intro") );
|
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("player options intro") );
|
||||||
|
|
||||||
this->SortByDrawOrder();
|
this->SortByDrawOrder();
|
||||||
@@ -102,9 +98,6 @@ void ScreenPlayerOptions::Input( const InputEventPlus &input )
|
|||||||
PlayerNumber pn = GAMESTATE->GetCurrentStyle()->ControllerToPlayerNumber( input.GameI.controller );
|
PlayerNumber pn = GAMESTATE->GetCurrentStyle()->ControllerToPlayerNumber( input.GameI.controller );
|
||||||
if( GAMESTATE->IsHumanPlayer(pn) && CodeDetector::EnteredCode(input.GameI.controller,CODE_CANCEL_ALL_PLAYER_OPTIONS) )
|
if( GAMESTATE->IsHumanPlayer(pn) && CodeDetector::EnteredCode(input.GameI.controller,CODE_CANCEL_ALL_PLAYER_OPTIONS) )
|
||||||
{
|
{
|
||||||
if( m_CancelAll.IsLoaded() )
|
|
||||||
m_CancelAll.Play();
|
|
||||||
|
|
||||||
// apply the game default mods, but not the Profile saved mods
|
// apply the game default mods, but not the Profile saved mods
|
||||||
GAMESTATE->GetDefaultPlayerOptions( GAMESTATE->m_pPlayerState[pn]->m_PlayerOptions );
|
GAMESTATE->GetDefaultPlayerOptions( GAMESTATE->m_pPlayerState[pn]->m_PlayerOptions );
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
#define SCREENPLAYEROPTIONS_H
|
#define SCREENPLAYEROPTIONS_H
|
||||||
|
|
||||||
#include "ScreenOptionsMaster.h"
|
#include "ScreenOptionsMaster.h"
|
||||||
#include "RageSound.h"
|
|
||||||
|
|
||||||
struct lua_State;
|
struct lua_State;
|
||||||
|
|
||||||
@@ -32,8 +31,6 @@ private:
|
|||||||
|
|
||||||
// show if the current selections will disqualify a high score
|
// show if the current selections will disqualify a high score
|
||||||
AutoActor m_sprDisqualify[NUM_PLAYERS];
|
AutoActor m_sprDisqualify[NUM_PLAYERS];
|
||||||
|
|
||||||
RageSound m_CancelAll;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user