From a222a01508fd5749e5bd72ed477839d72ec56271 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 10 Aug 2006 20:43:49 +0000 Subject: [PATCH] simplify --- stepmania/src/PaneDisplay.cpp | 6 +++--- stepmania/src/PaneDisplay.h | 2 +- stepmania/src/ScreenSelectMusic.cpp | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/stepmania/src/PaneDisplay.cpp b/stepmania/src/PaneDisplay.cpp index 995382c19c..c3de9cb4b9 100644 --- a/stepmania/src/PaneDisplay.cpp +++ b/stepmania/src/PaneDisplay.cpp @@ -258,9 +258,9 @@ done: LUA->Release(L); } -void PaneDisplay::SetFromGameState( SortOrder so ) +void PaneDisplay::SetFromGameState() { - m_SortOrder = so; + m_SortOrder = GAMESTATE->m_SortOrder; SetFocus( GetPane() ); /* Don't update text that doesn't apply to the current mode. It's still tweening off. */ @@ -320,7 +320,7 @@ class LunaPaneDisplay: public Luna public: LunaPaneDisplay() { LUA->Register( Register ); } - static int SetFromGameState( T* p, lua_State *L ) { p->SetFromGameState(SORT_PREFERRED); return 0; } + static int SetFromGameState( T* p, lua_State *L ) { p->SetFromGameState(); return 0; } static void Register(lua_State *L) { diff --git a/stepmania/src/PaneDisplay.h b/stepmania/src/PaneDisplay.h index a3669d3e61..0459226866 100644 --- a/stepmania/src/PaneDisplay.h +++ b/stepmania/src/PaneDisplay.h @@ -54,7 +54,7 @@ public: virtual Actor *Copy() const; void Load( const RString &sMetricsGroup, PlayerNumber pn ); - void SetFromGameState( SortOrder so ); + void SetFromGameState(); void LoadFromNode( const RString &sDir, const XNode *pNode ); diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index dee4c3586e..01181db5c6 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -1267,7 +1267,7 @@ void ScreenSelectMusic::AfterStepsChange( const vector &vpns ) m_GrooveRadar.SetFromSteps( pn, pSteps ); m_MusicWheel.NotesOrTrailChanged( pn ); if( SHOW_PANES ) - m_PaneDisplay[pn].SetFromGameState( GAMESTATE->m_SortOrder ); + m_PaneDisplay[pn].SetFromGameState(); } } @@ -1318,7 +1318,7 @@ void ScreenSelectMusic::AfterTrailChange( const vector &vpns ) m_GrooveRadar.SetEmpty( pn ); m_MusicWheel.NotesOrTrailChanged( pn ); if( SHOW_PANES ) - m_PaneDisplay[pn].SetFromGameState( GAMESTATE->m_SortOrder ); + m_PaneDisplay[pn].SetFromGameState(); } } @@ -1768,7 +1768,7 @@ void ScreenSelectMusic::SortOrderChanged() { if( SHOW_PANES ) FOREACH_HumanPlayer(pn) - m_PaneDisplay[pn].SetFromGameState( GAMESTATE->m_SortOrder ); + m_PaneDisplay[pn].SetFromGameState(); switch( GAMESTATE->m_SortOrder ) {