From b1360b0b4f07ce75a3c9ab93c61a32bca97e32b5 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 9 Jul 2005 08:28:49 +0000 Subject: [PATCH] remove OptionIconRow --- stepmania/src/ScreenSelectMusic.cpp | 12 +----------- stepmania/src/ScreenSelectMusic.h | 2 -- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 70aa8b3983..ffb71f6a59 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -243,12 +243,6 @@ void ScreenSelectMusic::Init() SET_XY( m_AutoGenIcon[p] ); this->AddChild( &m_AutoGenIcon[p] ); - m_OptionIconRow[p].SetName( ssprintf("OptionIconsP%d",p+1) ); - m_OptionIconRow[p].Load(); - m_OptionIconRow[p].SetFromGameState( p ); - SET_XY( m_OptionIconRow[p] ); - this->AddChild( &m_OptionIconRow[p] ); - m_sprMeterFrame[p].SetName( ssprintf("MeterFrameP%d",p+1) ); m_sprMeterFrame[p].Load( THEME->GetPathG(m_sName,ssprintf("meter frame p%d",p+1)) ); SET_XY( m_sprMeterFrame[p] ); @@ -491,7 +485,6 @@ void ScreenSelectMusic::TweenOnScreen() FOREACH_HumanPlayer( p ) { - ON_COMMAND( m_OptionIconRow[p] ); ON_COMMAND( m_sprHighScoreFrame[p] ); ON_COMMAND( m_textHighScore[p] ); if( SHOW_PANES ) @@ -543,7 +536,6 @@ void ScreenSelectMusic::TweenOffScreen() FOREACH_HumanPlayer( p ) { - OFF_COMMAND( m_OptionIconRow[p] ); OFF_COMMAND( m_sprHighScoreFrame[p] ); OFF_COMMAND( m_textHighScore[p] ); if( SHOW_PANES ) @@ -926,6 +918,7 @@ void ScreenSelectMusic::Input( const DeviceInput& DeviceI, InputEventType type, if( !GAMESTATE->IsExtraStage() && !GAMESTATE->IsExtraStage2() && CodeDetector::DetectAndAdjustMusicOptions(GameI.controller) ) { m_soundOptionsChange.Play(); + MESSAGEMAN->Broadcast( ssprintf("PlayerOptionsChangedP%i", pn+1) ); UpdateOptionsDisplays(); return; } @@ -1843,9 +1836,6 @@ void ScreenSelectMusic::AfterMusicChange() void ScreenSelectMusic::UpdateOptionsDisplays() { - FOREACH_HumanPlayer( p ) - m_OptionIconRow[p].SetFromGameState( p ); - CString s = GAMESTATE->m_SongOptions.GetString(); s.Replace( ", ", "\n" ); m_textSongOptions.SetText( s ); diff --git a/stepmania/src/ScreenSelectMusic.h b/stepmania/src/ScreenSelectMusic.h index 317fe0c800..4947119417 100644 --- a/stepmania/src/ScreenSelectMusic.h +++ b/stepmania/src/ScreenSelectMusic.h @@ -14,7 +14,6 @@ #include "GrooveRadar.h" #include "DifficultyIcon.h" #include "DifficultyMeter.h" -#include "OptionIconRow.h" #include "DifficultyDisplay.h" #include "DifficultyList.h" #include "CourseContentsList.h" @@ -103,7 +102,6 @@ protected: BitmapText m_textSongOptions; BitmapText m_textNumSongs; BitmapText m_textTotalTime; - OptionIconRow m_OptionIconRow[NUM_PLAYERS]; Sprite m_sprMeterFrame[NUM_PLAYERS]; DifficultyMeter m_DifficultyMeter[NUM_PLAYERS]; MusicSortDisplay m_MusicSortDisplay;