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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2006-08-16 22:17:58 +00:00
parent 4eca3c8d69
commit d7d689f515
3 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MusicWheelItem.cpp
+4 -4
View File
@@ -289,12 +289,12 @@ void MusicWheelItem::RefreshGrades()
else else
dc = GAMESTATE->m_PreferredDifficulty[p]; dc = GAMESTATE->m_PreferredDifficulty[p];
HighScore hs; ProfileSlot ps = ProfileSlot_Machine;
if( PROFILEMAN->IsPersistentProfile(p) ) if( PROFILEMAN->IsPersistentProfile(p) )
PROFILEMAN->GetHighScoreForDifficulty( data->m_pSong, GAMESTATE->GetCurrentStyle(), (ProfileSlot)p, dc, hs ); ps = (ProfileSlot)p;
else
PROFILEMAN->GetHighScoreForDifficulty( data->m_pSong, GAMESTATE->GetCurrentStyle(), ProfileSlot_Machine, dc, hs );
HighScore hs;
PROFILEMAN->GetHighScoreForDifficulty( data->m_pSong, GAMESTATE->GetCurrentStyle(), ps, dc, hs );
m_pGradeDisplay[p]->SetGrade( p, hs.GetGrade() ); m_pGradeDisplay[p]->SetGrade( p, hs.GetGrade() );
} }
} }
stepmania/src/ScreenSelectMusic.cpp
+1 -12
View File
@@ -32,8 +32,6 @@
const int NUM_SCORE_DIGITS = 9; const int NUM_SCORE_DIGITS = 9;
#define SCORE_SORT_CHANGE_COMMAND(i) THEME->GetMetricA( m_sName, ssprintf("ScoreP%iSortChangeCommand", i+1) )
#define SCORE_FRAME_SORT_CHANGE_COMMAND(i) THEME->GetMetricA( m_sName, ssprintf("ScoreFrameP%iSortChangeCommand", i+1) )
#define METER_TYPE THEME->GetMetric ( m_sName, "MeterType" ) #define METER_TYPE THEME->GetMetric ( m_sName, "MeterType" )
#define SHOW_OPTIONS_MESSAGE_SECONDS THEME->GetMetricF( m_sName, "ShowOptionsMessageSeconds" ) #define SHOW_OPTIONS_MESSAGE_SECONDS THEME->GetMetricF( m_sName, "ShowOptionsMessageSeconds" )
@@ -247,15 +245,6 @@ ScreenSelectMusic::~ScreenSelectMusic()
} }
void ScreenSelectMusic::TweenScoreOnAndOffAfterChangeSort()
{
FOREACH_HumanPlayer( p )
{
m_textHighScore[p].RunCommands( SCORE_SORT_CHANGE_COMMAND(p) );
m_sprHighScoreFrame[p].RunCommands( SCORE_FRAME_SORT_CHANGE_COMMAND(p) );
}
}
/* If bForce is true, the next request will be started even if it might cause a skip. */ /* If bForce is true, the next request will be started even if it might cause a skip. */
void ScreenSelectMusic::CheckBackgroundRequests( bool bForce ) void ScreenSelectMusic::CheckBackgroundRequests( bool bForce )
{ {
@@ -776,7 +765,7 @@ void ScreenSelectMusic::HandleScreenMessage( const ScreenMessage SM )
} }
else if( SM == SM_SortOrderChanging ) /* happens immediately */ else if( SM == SM_SortOrderChanging ) /* happens immediately */
{ {
TweenScoreOnAndOffAfterChangeSort(); this->PlayCommand( "SortChange" );
} }
else if( SM == SM_GainFocus ) else if( SM == SM_GainFocus )
{ {
stepmania/src/ScreenSelectMusic.h
-1
View File
@@ -46,7 +46,6 @@ public:
protected: protected:
virtual bool GenericTweenOn() const { return true; } virtual bool GenericTweenOn() const { return true; }
virtual bool GenericTweenOff() const { return true; } virtual bool GenericTweenOff() const { return true; }
void TweenScoreOnAndOffAfterChangeSort();
void UpdateSelectButton(); void UpdateSelectButton();
void ChangeDifficulty( PlayerNumber pn, int dir ); void ChangeDifficulty( PlayerNumber pn, int dir );