actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove OptionIconRow

Browse Source
This commit is contained in:
Glenn Maynard
2005-07-09 08:28:49 +00:00
parent d972df89f0
commit b1360b0b4f
2 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMusic.cpp
+1 -11
View File
@@ -243,12 +243,6 @@ void ScreenSelectMusic::Init()
SET_XY( m_AutoGenIcon[p] ); SET_XY( m_AutoGenIcon[p] );
this->AddChild( &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].SetName( ssprintf("MeterFrameP%d",p+1) );
m_sprMeterFrame[p].Load( THEME->GetPathG(m_sName,ssprintf("meter frame p%d",p+1)) ); m_sprMeterFrame[p].Load( THEME->GetPathG(m_sName,ssprintf("meter frame p%d",p+1)) );
SET_XY( m_sprMeterFrame[p] ); SET_XY( m_sprMeterFrame[p] );
@@ -491,7 +485,6 @@ void ScreenSelectMusic::TweenOnScreen()
FOREACH_HumanPlayer( p ) FOREACH_HumanPlayer( p )
{ {
ON_COMMAND( m_OptionIconRow[p] );
ON_COMMAND( m_sprHighScoreFrame[p] ); ON_COMMAND( m_sprHighScoreFrame[p] );
ON_COMMAND( m_textHighScore[p] ); ON_COMMAND( m_textHighScore[p] );
if( SHOW_PANES ) if( SHOW_PANES )
@@ -543,7 +536,6 @@ void ScreenSelectMusic::TweenOffScreen()
FOREACH_HumanPlayer( p ) FOREACH_HumanPlayer( p )
{ {
OFF_COMMAND( m_OptionIconRow[p] );
OFF_COMMAND( m_sprHighScoreFrame[p] ); OFF_COMMAND( m_sprHighScoreFrame[p] );
OFF_COMMAND( m_textHighScore[p] ); OFF_COMMAND( m_textHighScore[p] );
if( SHOW_PANES ) if( SHOW_PANES )
@@ -926,6 +918,7 @@ void ScreenSelectMusic::Input( const DeviceInput& DeviceI, InputEventType type,
if( !GAMESTATE->IsExtraStage() && !GAMESTATE->IsExtraStage2() && CodeDetector::DetectAndAdjustMusicOptions(GameI.controller) ) if( !GAMESTATE->IsExtraStage() && !GAMESTATE->IsExtraStage2() && CodeDetector::DetectAndAdjustMusicOptions(GameI.controller) )
{ {
m_soundOptionsChange.Play(); m_soundOptionsChange.Play();
MESSAGEMAN->Broadcast( ssprintf("PlayerOptionsChangedP%i", pn+1) );
UpdateOptionsDisplays(); UpdateOptionsDisplays();
return; return;
} }
@@ -1843,9 +1836,6 @@ void ScreenSelectMusic::AfterMusicChange()
void ScreenSelectMusic::UpdateOptionsDisplays() void ScreenSelectMusic::UpdateOptionsDisplays()
{ {
FOREACH_HumanPlayer( p )
m_OptionIconRow[p].SetFromGameState( p );
CString s = GAMESTATE->m_SongOptions.GetString(); CString s = GAMESTATE->m_SongOptions.GetString();
s.Replace( ", ", "\n" ); s.Replace( ", ", "\n" );
m_textSongOptions.SetText( s ); m_textSongOptions.SetText( s );
stepmania/src/ScreenSelectMusic.h
-2
View File
@@ -14,7 +14,6 @@
#include "GrooveRadar.h" #include "GrooveRadar.h"
#include "DifficultyIcon.h" #include "DifficultyIcon.h"
#include "DifficultyMeter.h" #include "DifficultyMeter.h"
#include "OptionIconRow.h"
#include "DifficultyDisplay.h" #include "DifficultyDisplay.h"
#include "DifficultyList.h" #include "DifficultyList.h"
#include "CourseContentsList.h" #include "CourseContentsList.h"
@@ -103,7 +102,6 @@ protected:
BitmapText m_textSongOptions; BitmapText m_textSongOptions;
BitmapText m_textNumSongs; BitmapText m_textNumSongs;
BitmapText m_textTotalTime; BitmapText m_textTotalTime;
OptionIconRow m_OptionIconRow[NUM_PLAYERS];
Sprite m_sprMeterFrame[NUM_PLAYERS]; Sprite m_sprMeterFrame[NUM_PLAYERS];
DifficultyMeter m_DifficultyMeter[NUM_PLAYERS]; DifficultyMeter m_DifficultyMeter[NUM_PLAYERS];
MusicSortDisplay m_MusicSortDisplay; MusicSortDisplay m_MusicSortDisplay;