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

better Steps difficulty description when copying or creating blank

Browse Source
This commit is contained in:
Chris Danford
2005-03-05 23:07:42 +00:00
parent 3e4e98de49
commit c9ec1c16b0
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEditMenu.cpp
+13
View File
@@ -96,6 +96,16 @@ void DeleteCurSteps( void* pThrowAway )
} }
static CString GetCopyDescription( const Steps *pSourceSteps )
{
CString s;
if( pSourceSteps->GetDifficulty() == DIFFICULTY_EDIT )
s = pSourceSteps->GetDescription();
else
s = DifficultyToThemedString( pSourceSteps->GetDifficulty() );
return "From " + s;
}
void ScreenEditMenu::MenuStart( PlayerNumber pn ) void ScreenEditMenu::MenuStart( PlayerNumber pn )
{ {
if( IsTransitioning() ) if( IsTransitioning() )
@@ -147,6 +157,7 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn )
Steps* pNewSteps = new Steps; Steps* pNewSteps = new Steps;
pNewSteps->CopyFrom( pSourceSteps, st ); pNewSteps->CopyFrom( pSourceSteps, st );
pNewSteps->SetDifficulty( dc ); pNewSteps->SetDifficulty( dc );
pNewSteps->SetDescription( GetCopyDescription(pSourceSteps) );
pSong->AddSteps( pNewSteps ); pSong->AddSteps( pNewSteps );
SCREENMAN->SystemMessage( "Steps created from copy." ); SCREENMAN->SystemMessage( "Steps created from copy." );
@@ -165,6 +176,7 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn )
pNewSteps->AutogenFrom( pSourceSteps, st ); pNewSteps->AutogenFrom( pSourceSteps, st );
pNewSteps->DeAutogen(); pNewSteps->DeAutogen();
pNewSteps->SetDifficulty( dc ); // override difficulty with the user's choice pNewSteps->SetDifficulty( dc ); // override difficulty with the user's choice
pNewSteps->SetDescription( GetCopyDescription(pSourceSteps) );
pSong->AddSteps( pNewSteps ); pSong->AddSteps( pNewSteps );
SCREENMAN->SystemMessage( "Steps created from AutoGen." ); SCREENMAN->SystemMessage( "Steps created from AutoGen." );
@@ -182,6 +194,7 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn )
pNewSteps->CreateBlank( st ); pNewSteps->CreateBlank( st );
pNewSteps->SetDifficulty( dc ); pNewSteps->SetDifficulty( dc );
pNewSteps->SetMeter( 1 ); pNewSteps->SetMeter( 1 );
pNewSteps->SetDescription( "Blank" );
pSong->AddSteps( pNewSteps ); pSong->AddSteps( pNewSteps );
SCREENMAN->SystemMessage( "Blank Steps created." ); SCREENMAN->SystemMessage( "Blank Steps created." );
stepmania/src/Steps.cpp
+1 -1
View File
@@ -267,7 +267,7 @@ void Steps::CopyFrom( Steps* pSource, StepsType ntTo ) // pSource does not have
pSource->GetNoteData( noteData ); pSource->GetNoteData( noteData );
noteData.SetNumTracks( GameManager::StepsTypeToNumTracks(ntTo) ); noteData.SetNumTracks( GameManager::StepsTypeToNumTracks(ntTo) );
this->SetNoteData( noteData ); this->SetNoteData( noteData );
this->SetDescription( "From " + pSource->GetDescription() ); this->SetDescription( pSource->GetDescription() );
this->SetDifficulty( pSource->GetDifficulty() ); this->SetDifficulty( pSource->GetDifficulty() );
this->SetMeter( pSource->GetMeter() ); this->SetMeter( pSource->GetMeter() );
this->SetRadarValues( pSource->GetRadarValues() ); this->SetRadarValues( pSource->GetRadarValues() );