remove unused, tried to do some work with section music, but no go.

This commit is contained in:
AJ Kelly
2011-02-08 01:47:43 -06:00
parent 0d4a450040
commit cbfbc0278a
2 changed files with 55 additions and 83 deletions
+6 -13
View File
@@ -34,17 +34,11 @@ AutoScreenMessage( SM_SongChanged )
AutoScreenMessage( SM_UsersUpdate ) AutoScreenMessage( SM_UsersUpdate )
AutoScreenMessage( SM_BackFromPlayerOptions ) AutoScreenMessage( SM_BackFromPlayerOptions )
// todo: metric this?
const RString AllGroups = "[ALL MUSIC]";
#define DIFFBG_WIDTH THEME->GetMetricF(m_sName,"DiffBGWidth")
#define DIFFBG_HEIGHT THEME->GetMetricF(m_sName,"DiffBGHeight")
REGISTER_SCREEN_CLASS( ScreenNetSelectMusic ); REGISTER_SCREEN_CLASS( ScreenNetSelectMusic );
void ScreenNetSelectMusic::Init() void ScreenNetSelectMusic::Init()
{ {
/* Finish any previous stage. It's OK to call this when we haven't played a stage yet. */ // Finish any previous stage. It's OK to call this when we haven't played a stage yet.
GAMESTATE->FinishStage(); GAMESTATE->FinishStage();
ScreenNetSelectBase::Init(); ScreenNetSelectBase::Init();
@@ -78,14 +72,14 @@ void ScreenNetSelectMusic::Init()
this->AddChild( &m_MusicWheel ); this->AddChild( &m_MusicWheel );
this->MoveToHead( &m_MusicWheel ); this->MoveToHead( &m_MusicWheel );
// todo: lua me? // todo: handle me theme-side -aj
m_BPMDisplay.SetName( "BPMDisplay" ); m_BPMDisplay.SetName( "BPMDisplay" );
m_BPMDisplay.LoadFromFont( THEME->GetPathF("BPMDisplay","bpm") ); m_BPMDisplay.LoadFromFont( THEME->GetPathF("BPMDisplay","bpm") );
m_BPMDisplay.Load(); m_BPMDisplay.Load();
LOAD_ALL_COMMANDS_AND_SET_XY_AND_ON_COMMAND( m_BPMDisplay ); LOAD_ALL_COMMANDS_AND_SET_XY_AND_ON_COMMAND( m_BPMDisplay );
this->AddChild( &m_BPMDisplay ); this->AddChild( &m_BPMDisplay );
// todo: lua me // todo: handle me theme-side -aj
FOREACH_EnabledPlayer( p ) FOREACH_EnabledPlayer( p )
{ {
m_ModIconRow[p].SetName( ssprintf("ModIconsP%d",p+1) ); m_ModIconRow[p].SetName( ssprintf("ModIconsP%d",p+1) );
@@ -131,6 +125,7 @@ void ScreenNetSelectMusic::Input( const InputEventPlus &input )
wchar_t c = INPUTMAN->DeviceInputToChar(input.DeviceI,false); wchar_t c = INPUTMAN->DeviceInputToChar(input.DeviceI,false);
MakeUpper( &c, 1 ); MakeUpper( &c, 1 );
// Ctrl+[A-Z] to go to that letter of the alphabet
if( bHoldingCtrl && ( c >= 'A' ) && ( c <= 'Z' ) ) if( bHoldingCtrl && ( c >= 'A' ) && ( c <= 'Z' ) )
{ {
SortOrder so = GAMESTATE->m_SortOrder; SortOrder so = GAMESTATE->m_SortOrder;
@@ -425,7 +420,6 @@ void ScreenNetSelectMusic::MenuStart( const InputEventPlus &input )
if( NSMAN->useSMserver ) if( NSMAN->useSMserver )
{ {
//int j = m_iSongNum % m_vSongs.size();
NSMAN->m_sArtist = pSong->GetTranslitArtist(); NSMAN->m_sArtist = pSong->GetTranslitArtist();
NSMAN->m_sMainTitle = pSong->GetTranslitMainTitle(); NSMAN->m_sMainTitle = pSong->GetTranslitMainTitle();
NSMAN->m_sSubTitle = pSong->GetTranslitSubTitle(); NSMAN->m_sSubTitle = pSong->GetTranslitSubTitle();
@@ -444,7 +438,6 @@ void ScreenNetSelectMusic::MenuBack( const InputEventPlus &input )
Cancel( SM_GoToPrevScreen ); Cancel( SM_GoToPrevScreen );
} }
void ScreenNetSelectMusic::TweenOffScreen() void ScreenNetSelectMusic::TweenOffScreen()
{ {
ScreenNetSelectBase::TweenOffScreen(); ScreenNetSelectBase::TweenOffScreen();
@@ -528,7 +521,8 @@ void ScreenNetSelectMusic::MusicChanged()
UpdateDifficulties( pn ); UpdateDifficulties( pn );
SOUND->StopMusic(); SOUND->StopMusic();
// xxx: it should play the menu music instead. -aj // todo: handle playing section music correctly. -aj
// SOUND->PlayMusic( m_sSectionMusicPath, NULL, true, 0, -1 );
return; return;
} }
m_BPMDisplay.SetBpmFromSong( GAMESTATE->m_pCurSong ); m_BPMDisplay.SetBpmFromSong( GAMESTATE->m_pCurSong );
@@ -599,7 +593,6 @@ void ScreenNetSelectMusic::Update( float fDeltaTime )
ScreenNetSelectBase::Update( fDeltaTime ); ScreenNetSelectBase::Update( fDeltaTime );
} }
#endif #endif
/* /*
+2 -23
View File
@@ -21,30 +21,8 @@ public:
virtual void Input( const InputEventPlus &input ); virtual void Input( const InputEventPlus &input );
virtual void HandleScreenMessage( const ScreenMessage SM ); virtual void HandleScreenMessage( const ScreenMessage SM );
void UpdateSongsListPos();
void UpdateGroupsListPos();
void UpdateSongsList();
void UpdateTextInput();
void StartSelectedSong(); void StartSelectedSong();
private:
int m_iSongNum;
int m_iShowSongs; //The number of songs to display to each side
int m_iGroupNum;
int m_iShowGroups; //The number of groups to display to each side
enum NetScreenSelectModes
{
SelectGroup = 0,
SelectSong,
SelectDifficulty,
SelectOptions,
SelectModes,
};
NetScreenSelectModes m_SelectMode;
protected: protected:
virtual void MenuStart( const InputEventPlus &input ); virtual void MenuStart( const InputEventPlus &input );
virtual void MenuLeft( const InputEventPlus &input ); virtual void MenuLeft( const InputEventPlus &input );
@@ -67,7 +45,7 @@ protected:
private: private:
MusicWheel m_MusicWheel; MusicWheel m_MusicWheel;
// todo: replace difficulty icons with StepsDisplay out the ass // todo: replace difficulty icons with StepsDisplay -aj
//Difficulty Icon(s) //Difficulty Icon(s)
//DifficultyIcon m_DifficultyIcon[NUM_PLAYERS]; //DifficultyIcon m_DifficultyIcon[NUM_PLAYERS];
Difficulty m_DC[NUM_PLAYERS]; Difficulty m_DC[NUM_PLAYERS];
@@ -78,6 +56,7 @@ private:
RageSound m_soundChangeOpt; RageSound m_soundChangeOpt;
RageSound m_soundChangeSel; RageSound m_soundChangeSel;
// todo: do these theme-side instead. -aj
BPMDisplay m_BPMDisplay; BPMDisplay m_BPMDisplay;
ModIconRow m_ModIconRow[NUM_PLAYERS]; ModIconRow m_ModIconRow[NUM_PLAYERS];