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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2006-08-10 20:43:49 +00:00
parent cf4616a6eb
commit a222a01508
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/PaneDisplay.cpp
+3 -3
View File
@@ -258,9 +258,9 @@ done:
LUA->Release(L); LUA->Release(L);
} }
void PaneDisplay::SetFromGameState( SortOrder so ) void PaneDisplay::SetFromGameState()
{ {
m_SortOrder = so; m_SortOrder = GAMESTATE->m_SortOrder;
SetFocus( GetPane() ); SetFocus( GetPane() );
/* Don't update text that doesn't apply to the current mode. It's still tweening off. */ /* 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<PaneDisplay>
public: public:
LunaPaneDisplay() { LUA->Register( Register ); } 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) static void Register(lua_State *L)
{ {
stepmania/src/PaneDisplay.h
+1 -1
View File
@@ -54,7 +54,7 @@ public:
virtual Actor *Copy() const; virtual Actor *Copy() const;
void Load( const RString &sMetricsGroup, PlayerNumber pn ); void Load( const RString &sMetricsGroup, PlayerNumber pn );
void SetFromGameState( SortOrder so ); void SetFromGameState();
void LoadFromNode( const RString &sDir, const XNode *pNode ); void LoadFromNode( const RString &sDir, const XNode *pNode );
stepmania/src/ScreenSelectMusic.cpp
+3 -3
View File
@@ -1267,7 +1267,7 @@ void ScreenSelectMusic::AfterStepsChange( const vector<PlayerNumber> &vpns )
m_GrooveRadar.SetFromSteps( pn, pSteps ); m_GrooveRadar.SetFromSteps( pn, pSteps );
m_MusicWheel.NotesOrTrailChanged( pn ); m_MusicWheel.NotesOrTrailChanged( pn );
if( SHOW_PANES ) if( SHOW_PANES )
m_PaneDisplay[pn].SetFromGameState( GAMESTATE->m_SortOrder ); m_PaneDisplay[pn].SetFromGameState();
} }
} }
@@ -1318,7 +1318,7 @@ void ScreenSelectMusic::AfterTrailChange( const vector<PlayerNumber> &vpns )
m_GrooveRadar.SetEmpty( pn ); m_GrooveRadar.SetEmpty( pn );
m_MusicWheel.NotesOrTrailChanged( pn ); m_MusicWheel.NotesOrTrailChanged( pn );
if( SHOW_PANES ) if( SHOW_PANES )
m_PaneDisplay[pn].SetFromGameState( GAMESTATE->m_SortOrder ); m_PaneDisplay[pn].SetFromGameState();
} }
} }
@@ -1768,7 +1768,7 @@ void ScreenSelectMusic::SortOrderChanged()
{ {
if( SHOW_PANES ) if( SHOW_PANES )
FOREACH_HumanPlayer(pn) FOREACH_HumanPlayer(pn)
m_PaneDisplay[pn].SetFromGameState( GAMESTATE->m_SortOrder ); m_PaneDisplay[pn].SetFromGameState();
switch( GAMESTATE->m_SortOrder ) switch( GAMESTATE->m_SortOrder )
{ {