From 22b6ffbe5fe084692e39583ac72ec5a535be53a8 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 25 Jun 2005 08:03:08 +0000 Subject: [PATCH] simplify: just broadcast a message on reset --- stepmania/src/ScreenPlayerOptions.cpp | 9 +-------- stepmania/src/ScreenPlayerOptions.h | 2 -- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp index f23e2ab4f8..aca3c8b819 100644 --- a/stepmania/src/ScreenPlayerOptions.cpp +++ b/stepmania/src/ScreenPlayerOptions.cpp @@ -55,13 +55,6 @@ void ScreenPlayerOptions::Init() SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("player options intro") ); - FOREACH_HumanPlayer( p ) - { - m_sprCancelAll[p].LoadAndSetName( "ScreenPlayerOptions", ssprintf("CancelAllP%d",p+1) ); - SET_XY_AND_ON_COMMAND( m_sprCancelAll[p] ); - this->AddChild( m_sprCancelAll[p] ); - } - FOREACH_HumanPlayer( p ) { m_bRowCausesDisqualified[p].resize( m_pRows.size(), false ); @@ -111,7 +104,7 @@ void ScreenPlayerOptions::Input( const DeviceInput& DeviceI, const InputEventTyp GAMESTATE->m_pPlayerState[pn]->m_PlayerOptions.Init(); GAMESTATE->m_pPlayerState[pn]->m_PlayerOptions.FromString( PREFSMAN->m_sDefaultModifiers ); - COMMAND( m_sprCancelAll[pn], "Show" ); + MESSAGEMAN->Broadcast( ssprintf("CancelAllP%i", pn+1) ); for( unsigned r=0; r