From 3ee5aa4071aa622f345672a09269e877d7a36bc7 Mon Sep 17 00:00:00 2001 From: Charles Lohr Date: Fri, 17 Sep 2004 22:53:17 +0000 Subject: [PATCH] Fix: Difficulty issues, and rainbow issues. --- stepmania/src/ScreenNetEvaluation.cpp | 2 ++ stepmania/src/ScreenNetSelectMusic.cpp | 11 ++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/stepmania/src/ScreenNetEvaluation.cpp b/stepmania/src/ScreenNetEvaluation.cpp index 208dc5ff0a..d61a7beac0 100644 --- a/stepmania/src/ScreenNetEvaluation.cpp +++ b/stepmania/src/ScreenNetEvaluation.cpp @@ -108,6 +108,8 @@ void ScreenNetEvaluation::HandleScreenMessage( const ScreenMessage SM ) m_textUsers[i].SetText( NSMAN->m_PlayerNames[NSMAN->m_EvalPlayerData[i].name] ); if ( NSMAN->m_EvalPlayerData[i].grade < GRADE_TIER_3 ) //Yes, hardcoded (I'd like to leave it that way) m_textUsers[i].TurnRainbowOn(); + else + m_textUsers[i].TurnRainbowOff(); ON_COMMAND( m_textUsers[i] ); } return; //no need to let ScreenEvaluation get ahold of this. diff --git a/stepmania/src/ScreenNetSelectMusic.cpp b/stepmania/src/ScreenNetSelectMusic.cpp index 76ed83319d..efa1648c96 100644 --- a/stepmania/src/ScreenNetSelectMusic.cpp +++ b/stepmania/src/ScreenNetSelectMusic.cpp @@ -616,12 +616,17 @@ void ScreenNetSelectMusic::StartSelectedSong() void ScreenNetSelectMusic::UpdateDifficulties( PlayerNumber pn ) { - m_DifficultyIcon[pn].SetFromDifficulty( pn, m_DC[pn] ); + if ( ( m_DC[pn] < DIFFICULTY_EDIT ) && ( m_DC[pn] >= DIFFICULTY_BEGINNER ) ) + m_DifficultyIcon[pn].SetFromDifficulty( pn, m_DC[pn] ); + else + m_DifficultyIcon[pn].SetFromSteps( pn, NULL ); //It will blank it out + StepsType st = GAMESTATE->GetCurrentStyle()->m_StepsType; - if ( m_DC[pn] != NUM_DIFFICULTIES ) + + if ( ( m_DC[pn] < NUM_DIFFICULTIES ) && ( m_DC[pn] >= DIFFICULTY_BEGINNER ) ) m_DifficultyMeters[pn].SetFromSteps( GAMESTATE->m_pCurSong->GetStepsByDifficulty( st, m_DC[pn] ) ); else - m_DifficultyMeters[pn].SetFromMeterAndDifficulty( 0, m_DC[pn] ); + m_DifficultyMeters[pn].SetFromMeterAndDifficulty( 0, DIFFICULTY_BEGINNER ); } void ScreenNetSelectMusic::UpdateSongsListPos()