From 6ad780417e9d90ac4c431fb5df870815365e0d5d Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 29 May 2004 04:50:47 +0000 Subject: [PATCH] "SetFromNotes" -> "SetFromSteps" --- stepmania/src/DifficultyIcon.cpp | 2 +- stepmania/src/DifficultyIcon.h | 2 +- stepmania/src/DifficultyList.cpp | 2 +- stepmania/src/DifficultyMeter.cpp | 4 ++-- stepmania/src/DifficultyMeter.h | 2 +- stepmania/src/EditMenu.cpp | 4 ++-- stepmania/src/GrooveRadar.cpp | 2 +- stepmania/src/GrooveRadar.h | 6 +++--- stepmania/src/ScreenEvaluation.cpp | 2 +- stepmania/src/ScreenEz2SelectMusic.cpp | 2 +- stepmania/src/ScreenGameplay.cpp | 2 +- stepmania/src/ScreenNameEntryTraditional.cpp | 2 +- stepmania/src/ScreenSelectMusic.cpp | 4 ++-- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/stepmania/src/DifficultyIcon.cpp b/stepmania/src/DifficultyIcon.cpp index 87bc4236f1..651424330a 100644 --- a/stepmania/src/DifficultyIcon.cpp +++ b/stepmania/src/DifficultyIcon.cpp @@ -49,7 +49,7 @@ bool DifficultyIcon::Load( CString sPath ) return true; } -void DifficultyIcon::SetFromNotes( PlayerNumber pn, Steps* pSteps ) +void DifficultyIcon::SetFromSteps( PlayerNumber pn, Steps* pSteps ) { if( pSteps == NULL ) m_bBlank = true; diff --git a/stepmania/src/DifficultyIcon.h b/stepmania/src/DifficultyIcon.h index f62c97048f..2d7838634d 100644 --- a/stepmania/src/DifficultyIcon.h +++ b/stepmania/src/DifficultyIcon.h @@ -27,7 +27,7 @@ public: bool Load( CString sFilePath ); - void SetFromNotes( PlayerNumber pn, Steps* pSteps ); + void SetFromSteps( PlayerNumber pn, Steps* pSteps ); void SetFromDifficulty( PlayerNumber pn, Difficulty dc ); void SetFromCourseDifficulty( PlayerNumber pn, CourseDifficulty cd ); }; diff --git a/stepmania/src/DifficultyList.cpp b/stepmania/src/DifficultyList.cpp index fd36764f10..3ad9a8ab1a 100644 --- a/stepmania/src/DifficultyList.cpp +++ b/stepmania/src/DifficultyList.cpp @@ -319,7 +319,7 @@ void DifficultyList::SetFromGameState() row.m_Steps = CurSteps[i]; - m_Lines[i].m_Meter.SetFromNotes( m_Rows[i].m_Steps ); + m_Lines[i].m_Meter.SetFromSteps( m_Rows[i].m_Steps ); row.m_dc = row.m_Steps->GetDifficulty(); diff --git a/stepmania/src/DifficultyMeter.cpp b/stepmania/src/DifficultyMeter.cpp index 0f026b5d4f..a7f0125af6 100644 --- a/stepmania/src/DifficultyMeter.cpp +++ b/stepmania/src/DifficultyMeter.cpp @@ -98,7 +98,7 @@ void DifficultyMeter::Load() Unset(); } -void DifficultyMeter::SetFromNotes( const Steps* pSteps ) +void DifficultyMeter::SetFromSteps( const Steps* pSteps ) { if( pSteps == NULL ) { @@ -180,7 +180,7 @@ void DifficultyMeter::SetFromGameState( PlayerNumber pn ) { Steps* pSteps = GAMESTATE->m_pCurSteps[pn]; if( pSteps ) - SetFromNotes( pSteps ); + SetFromSteps( pSteps ); else SetFromDifficulty( GAMESTATE->m_PreferredDifficulty[pn] ); } diff --git a/stepmania/src/DifficultyMeter.h b/stepmania/src/DifficultyMeter.h index 1cd3bbe879..8a336d9b6d 100644 --- a/stepmania/src/DifficultyMeter.h +++ b/stepmania/src/DifficultyMeter.h @@ -30,7 +30,7 @@ public: void SetFromGameState( PlayerNumber pn ); void SetFromDifficulty( Difficulty dc ); void SetFromCourseDifficulty( CourseDifficulty cd ); - void SetFromNotes( const Steps* pSteps ); + void SetFromSteps( const Steps* pSteps ); void SetFromCourse( const Course* pCourse, PlayerNumber pn ); void Unset(); void SetMeter( int iMeter, Difficulty dc ); diff --git a/stepmania/src/EditMenu.cpp b/stepmania/src/EditMenu.cpp index 985cde4d4c..55ca45c287 100644 --- a/stepmania/src/EditMenu.cpp +++ b/stepmania/src/EditMenu.cpp @@ -279,7 +279,7 @@ void EditMenu::OnRowValueChanged( Row row ) // fall through case ROW_DIFFICULTY: m_textValue[ROW_DIFFICULTY].SetText( DifficultyToString(GetSelectedDifficulty()) ); - m_Meter.SetFromNotes( GetSelectedNotes() ); + m_Meter.SetFromSteps( GetSelectedNotes() ); // fall through case ROW_SOURCE_NOTES_TYPE: m_textLabel[ROW_SOURCE_NOTES_TYPE].SetDiffuse( GetSelectedNotes()?RageColor(1,1,1,0):RageColor(1,1,1,1) ); @@ -290,7 +290,7 @@ void EditMenu::OnRowValueChanged( Row row ) m_textLabel[ROW_SOURCE_DIFFICULTY].SetDiffuse( GetSelectedNotes()?RageColor(1,1,1,0):RageColor(1,1,1,1) ); m_textValue[ROW_SOURCE_DIFFICULTY].SetDiffuse( GetSelectedNotes()?RageColor(1,1,1,0):RageColor(1,1,1,1) ); m_textValue[ROW_SOURCE_DIFFICULTY].SetText( DifficultyToString(GetSelectedSourceDifficulty()) ); - m_SourceMeter.SetFromNotes( GetSelectedSourceNotes() ); + m_SourceMeter.SetFromSteps( GetSelectedSourceNotes() ); m_SourceMeter.SetZoomY( GetSelectedNotes()?0.f:1.f ); m_Actions.clear(); diff --git a/stepmania/src/GrooveRadar.cpp b/stepmania/src/GrooveRadar.cpp index 34cca51aa0..b5a82adfad 100644 --- a/stepmania/src/GrooveRadar.cpp +++ b/stepmania/src/GrooveRadar.cpp @@ -91,7 +91,7 @@ GrooveRadar::GrooveRadarValueMap::GrooveRadarValueMap() } } -void GrooveRadar::GrooveRadarValueMap::SetFromNotes( PlayerNumber pn, Steps* pSteps ) // NULL means no song +void GrooveRadar::GrooveRadarValueMap::SetFromSteps( PlayerNumber pn, Steps* pSteps ) // NULL means no song { if(DISABLE_RADAR == 1) // if the theme says not to disable it return; diff --git a/stepmania/src/GrooveRadar.h b/stepmania/src/GrooveRadar.h index 452d99ea98..8a8acdc426 100644 --- a/stepmania/src/GrooveRadar.h +++ b/stepmania/src/GrooveRadar.h @@ -23,9 +23,9 @@ class GrooveRadar : public ActorFrame public: GrooveRadar(); - void SetFromNotes( PlayerNumber pn, Steps* pSteps ) // NULL means no Song + void SetFromSteps( PlayerNumber pn, Steps* pSteps ) // NULL means no Song { - m_GrooveRadarValueMap.SetFromNotes( pn, pSteps ); + m_GrooveRadarValueMap.SetFromSteps( pn, pSteps ); } void TweenOnScreen(); @@ -42,7 +42,7 @@ protected: virtual void Update( float fDeltaTime ); virtual void DrawPrimitives(); - void SetFromNotes( PlayerNumber pn, Steps* pSteps ); // NULL means no Song + void SetFromSteps( PlayerNumber pn, Steps* pSteps ); // NULL means no Song void TweenOnScreen(); void TweenOffScreen(); diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 6e09751dac..c3ab0576ea 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -363,7 +363,7 @@ void ScreenEvaluation::Init() switch( m_Type ) { case stage: - m_DifficultyIcon[p].SetFromNotes( p, GAMESTATE->m_pCurSteps[p] ); + m_DifficultyIcon[p].SetFromSteps( p, GAMESTATE->m_pCurSteps[p] ); break; case course: m_DifficultyIcon[p].SetFromCourseDifficulty( p, GAMESTATE->m_PreferredCourseDifficulty[p] ); diff --git a/stepmania/src/ScreenEz2SelectMusic.cpp b/stepmania/src/ScreenEz2SelectMusic.cpp index ea38fe19c1..a782475227 100644 --- a/stepmania/src/ScreenEz2SelectMusic.cpp +++ b/stepmania/src/ScreenEz2SelectMusic.cpp @@ -696,6 +696,6 @@ void ScreenEz2SelectMusic::AfterNotesChange( PlayerNumber pn ) // Steps* m_pSteps = GAMESTATE->m_pCurSteps[pn]; -// m_FootMeter[pn].SetFromNotes( pSteps ); +// m_FootMeter[pn].SetFromSteps( pSteps ); } diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index c2779f2343..bcef25fa6c 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -912,7 +912,7 @@ void ScreenGameplay::LoadNextSong() PREFSMAN->m_iProgressiveNonstopLifebar); } - m_DifficultyIcon[p].SetFromNotes( PlayerNumber(p), GAMESTATE->m_pCurSteps[p] ); + m_DifficultyIcon[p].SetFromSteps( PlayerNumber(p), GAMESTATE->m_pCurSteps[p] ); /* The actual note data for scoring is the base class of Player. This includes * transforms, like Wide. Otherwise, the scoring will operate on the wrong data. */ diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp index aa5e485ac3..bdc39767ce 100644 --- a/stepmania/src/ScreenNameEntryTraditional.cpp +++ b/stepmania/src/ScreenNameEntryTraditional.cpp @@ -388,7 +388,7 @@ ScreenNameEntryTraditional::ScreenNameEntryTraditional( CString sClassName ) : S if( GAMESTATE->IsCourseMode() ) display.m_Difficulty.SetFromCourseDifficulty( (PlayerNumber)p, GAMESTATE->m_PreferredCourseDifficulty[p] ); else - display.m_Difficulty.SetFromNotes( (PlayerNumber)p, pSteps ); + display.m_Difficulty.SetFromSteps( (PlayerNumber)p, pSteps ); SET_ON( display.m_Difficulty ); this->AddChild( &display.m_Difficulty ); diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index b5f9bba614..dbb54d9504 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -1208,7 +1208,7 @@ void ScreenSelectMusic::AfterNotesChange( PlayerNumber pn ) m_textHighScore[pn].SetText( ssprintf("%*i", NUM_SCORE_DIGITS, 0) ); } - m_DifficultyIcon[pn].SetFromNotes( pn, pSteps ); + m_DifficultyIcon[pn].SetFromSteps( pn, pSteps ); if( pSteps && pSteps->IsAutogen() ) { m_AutoGenIcon[pn].SetEffectDiffuseShift(); @@ -1221,7 +1221,7 @@ void ScreenSelectMusic::AfterNotesChange( PlayerNumber pn ) m_DifficultyMeter[pn].SetFromGameState( pn ); if( SHOW_DIFFICULTY_LIST ) m_DifficultyList.SetFromGameState(); - m_GrooveRadar.SetFromNotes( pn, pSteps ); + m_GrooveRadar.SetFromSteps( pn, pSteps ); m_MusicWheel.NotesChanged( pn ); if( SHOW_PANES ) m_PaneDisplay[pn].SetFromGameState();