From 7b1ea8af22c76007671b6e4dd9ea95ebdc3e5d66 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 13 Mar 2006 09:52:12 +0000 Subject: [PATCH] do this with ActorSound --- stepmania/src/ScreenPlayerOptions.cpp | 7 ------- stepmania/src/ScreenPlayerOptions.h | 3 --- 2 files changed, 10 deletions(-) diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp index 54ca69593e..b285a8a403 100644 --- a/stepmania/src/ScreenPlayerOptions.cpp +++ b/stepmania/src/ScreenPlayerOptions.cpp @@ -56,10 +56,6 @@ void ScreenPlayerOptions::Init() m_bAcceptedChoices = false; 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") ); this->SortByDrawOrder(); @@ -102,9 +98,6 @@ void ScreenPlayerOptions::Input( const InputEventPlus &input ) PlayerNumber pn = GAMESTATE->GetCurrentStyle()->ControllerToPlayerNumber( input.GameI.controller ); 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 GAMESTATE->GetDefaultPlayerOptions( GAMESTATE->m_pPlayerState[pn]->m_PlayerOptions ); diff --git a/stepmania/src/ScreenPlayerOptions.h b/stepmania/src/ScreenPlayerOptions.h index 63872109b2..ad6fdeda86 100644 --- a/stepmania/src/ScreenPlayerOptions.h +++ b/stepmania/src/ScreenPlayerOptions.h @@ -2,7 +2,6 @@ #define SCREENPLAYEROPTIONS_H #include "ScreenOptionsMaster.h" -#include "RageSound.h" struct lua_State; @@ -32,8 +31,6 @@ private: // show if the current selections will disqualify a high score AutoActor m_sprDisqualify[NUM_PLAYERS]; - - RageSound m_CancelAll; }; #endif