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

"SetFromNotes" -> "SetFromSteps"

Browse Source
This commit is contained in:
Chris Danford
2004-05-29 04:50:47 +00:00
parent fc17a8cd12
commit 6ad780417e
13 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/DifficultyIcon.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ bool DifficultyIcon::Load( CString sPath )
return true; return true;
} }
void DifficultyIcon::SetFromNotes( PlayerNumber pn, Steps* pSteps ) void DifficultyIcon::SetFromSteps( PlayerNumber pn, Steps* pSteps )
{ {
if( pSteps == NULL ) if( pSteps == NULL )
m_bBlank = true; m_bBlank = true;
stepmania/src/DifficultyIcon.h
+1 -1
View File
@@ -27,7 +27,7 @@ public:
bool Load( CString sFilePath ); bool Load( CString sFilePath );
void SetFromNotes( PlayerNumber pn, Steps* pSteps ); void SetFromSteps( PlayerNumber pn, Steps* pSteps );
void SetFromDifficulty( PlayerNumber pn, Difficulty dc ); void SetFromDifficulty( PlayerNumber pn, Difficulty dc );
void SetFromCourseDifficulty( PlayerNumber pn, CourseDifficulty cd ); void SetFromCourseDifficulty( PlayerNumber pn, CourseDifficulty cd );
}; };
stepmania/src/DifficultyList.cpp
+1 -1
View File
@@ -319,7 +319,7 @@ void DifficultyList::SetFromGameState()
row.m_Steps = CurSteps[i]; 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(); row.m_dc = row.m_Steps->GetDifficulty();
stepmania/src/DifficultyMeter.cpp
+2 -2
View File
@@ -98,7 +98,7 @@ void DifficultyMeter::Load()
Unset(); Unset();
} }
void DifficultyMeter::SetFromNotes( const Steps* pSteps ) void DifficultyMeter::SetFromSteps( const Steps* pSteps )
{ {
if( pSteps == NULL ) if( pSteps == NULL )
{ {
@@ -180,7 +180,7 @@ void DifficultyMeter::SetFromGameState( PlayerNumber pn )
{ {
Steps* pSteps = GAMESTATE->m_pCurSteps[pn]; Steps* pSteps = GAMESTATE->m_pCurSteps[pn];
if( pSteps ) if( pSteps )
SetFromNotes( pSteps ); SetFromSteps( pSteps );
else else
SetFromDifficulty( GAMESTATE->m_PreferredDifficulty[pn] ); SetFromDifficulty( GAMESTATE->m_PreferredDifficulty[pn] );
} }
stepmania/src/DifficultyMeter.h
+1 -1
View File
@@ -30,7 +30,7 @@ public:
void SetFromGameState( PlayerNumber pn ); void SetFromGameState( PlayerNumber pn );
void SetFromDifficulty( Difficulty dc ); void SetFromDifficulty( Difficulty dc );
void SetFromCourseDifficulty( CourseDifficulty cd ); void SetFromCourseDifficulty( CourseDifficulty cd );
void SetFromNotes( const Steps* pSteps ); void SetFromSteps( const Steps* pSteps );
void SetFromCourse( const Course* pCourse, PlayerNumber pn ); void SetFromCourse( const Course* pCourse, PlayerNumber pn );
void Unset(); void Unset();
void SetMeter( int iMeter, Difficulty dc ); void SetMeter( int iMeter, Difficulty dc );
stepmania/src/EditMenu.cpp
+2 -2
View File
@@ -279,7 +279,7 @@ void EditMenu::OnRowValueChanged( Row row )
// fall through // fall through
case ROW_DIFFICULTY: case ROW_DIFFICULTY:
m_textValue[ROW_DIFFICULTY].SetText( DifficultyToString(GetSelectedDifficulty()) ); m_textValue[ROW_DIFFICULTY].SetText( DifficultyToString(GetSelectedDifficulty()) );
m_Meter.SetFromNotes( GetSelectedNotes() ); m_Meter.SetFromSteps( GetSelectedNotes() );
// fall through // fall through
case ROW_SOURCE_NOTES_TYPE: case ROW_SOURCE_NOTES_TYPE:
m_textLabel[ROW_SOURCE_NOTES_TYPE].SetDiffuse( GetSelectedNotes()?RageColor(1,1,1,0):RageColor(1,1,1,1) ); 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_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].SetDiffuse( GetSelectedNotes()?RageColor(1,1,1,0):RageColor(1,1,1,1) );
m_textValue[ROW_SOURCE_DIFFICULTY].SetText( DifficultyToString(GetSelectedSourceDifficulty()) ); 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_SourceMeter.SetZoomY( GetSelectedNotes()?0.f:1.f );
m_Actions.clear(); m_Actions.clear();
stepmania/src/GrooveRadar.cpp
+1 -1
View File
@@ -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 if(DISABLE_RADAR == 1) // if the theme says not to disable it
return; return;
stepmania/src/GrooveRadar.h
+3 -3
View File
@@ -23,9 +23,9 @@ class GrooveRadar : public ActorFrame
public: public:
GrooveRadar(); 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(); void TweenOnScreen();
@@ -42,7 +42,7 @@ protected:
virtual void Update( float fDeltaTime ); virtual void Update( float fDeltaTime );
virtual void DrawPrimitives(); 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 TweenOnScreen();
void TweenOffScreen(); void TweenOffScreen();
stepmania/src/ScreenEvaluation.cpp
+1 -1
View File
@@ -363,7 +363,7 @@ void ScreenEvaluation::Init()
switch( m_Type ) switch( m_Type )
{ {
case stage: case stage:
m_DifficultyIcon[p].SetFromNotes( p, GAMESTATE->m_pCurSteps[p] ); m_DifficultyIcon[p].SetFromSteps( p, GAMESTATE->m_pCurSteps[p] );
break; break;
case course: case course:
m_DifficultyIcon[p].SetFromCourseDifficulty( p, GAMESTATE->m_PreferredCourseDifficulty[p] ); m_DifficultyIcon[p].SetFromCourseDifficulty( p, GAMESTATE->m_PreferredCourseDifficulty[p] );
stepmania/src/ScreenEz2SelectMusic.cpp
+1 -1
View File
@@ -696,6 +696,6 @@ void ScreenEz2SelectMusic::AfterNotesChange( PlayerNumber pn )
// Steps* m_pSteps = GAMESTATE->m_pCurSteps[pn]; // Steps* m_pSteps = GAMESTATE->m_pCurSteps[pn];
// m_FootMeter[pn].SetFromNotes( pSteps ); // m_FootMeter[pn].SetFromSteps( pSteps );
} }
stepmania/src/ScreenGameplay.cpp
+1 -1
View File
@@ -912,7 +912,7 @@ void ScreenGameplay::LoadNextSong()
PREFSMAN->m_iProgressiveNonstopLifebar); 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 /* 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. */ * transforms, like Wide. Otherwise, the scoring will operate on the wrong data. */
stepmania/src/ScreenNameEntryTraditional.cpp
+1 -1
View File
@@ -388,7 +388,7 @@ ScreenNameEntryTraditional::ScreenNameEntryTraditional( CString sClassName ) : S
if( GAMESTATE->IsCourseMode() ) if( GAMESTATE->IsCourseMode() )
display.m_Difficulty.SetFromCourseDifficulty( (PlayerNumber)p, GAMESTATE->m_PreferredCourseDifficulty[p] ); display.m_Difficulty.SetFromCourseDifficulty( (PlayerNumber)p, GAMESTATE->m_PreferredCourseDifficulty[p] );
else else
display.m_Difficulty.SetFromNotes( (PlayerNumber)p, pSteps ); display.m_Difficulty.SetFromSteps( (PlayerNumber)p, pSteps );
SET_ON( display.m_Difficulty ); SET_ON( display.m_Difficulty );
this->AddChild( &display.m_Difficulty ); this->AddChild( &display.m_Difficulty );
stepmania/src/ScreenSelectMusic.cpp
+2 -2
View File
@@ -1208,7 +1208,7 @@ void ScreenSelectMusic::AfterNotesChange( PlayerNumber pn )
m_textHighScore[pn].SetText( ssprintf("%*i", NUM_SCORE_DIGITS, 0) ); 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() ) if( pSteps && pSteps->IsAutogen() )
{ {
m_AutoGenIcon[pn].SetEffectDiffuseShift(); m_AutoGenIcon[pn].SetEffectDiffuseShift();
@@ -1221,7 +1221,7 @@ void ScreenSelectMusic::AfterNotesChange( PlayerNumber pn )
m_DifficultyMeter[pn].SetFromGameState( pn ); m_DifficultyMeter[pn].SetFromGameState( pn );
if( SHOW_DIFFICULTY_LIST ) if( SHOW_DIFFICULTY_LIST )
m_DifficultyList.SetFromGameState(); m_DifficultyList.SetFromGameState();
m_GrooveRadar.SetFromNotes( pn, pSteps ); m_GrooveRadar.SetFromSteps( pn, pSteps );
m_MusicWheel.NotesChanged( pn ); m_MusicWheel.NotesChanged( pn );
if( SHOW_PANES ) if( SHOW_PANES )
m_PaneDisplay[pn].SetFromGameState(); m_PaneDisplay[pn].SetFromGameState();