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

don't allow blank edit names

Browse Source
This commit is contained in:
Chris Danford
2005-04-03 21:23:38 +00:00
parent dbea7450b6
commit 3c5a892b27
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEditMenu.cpp
+13 -7
View File
@@ -152,14 +152,20 @@ static CString GetCopyDescription( const Steps *pSourceSteps )
static bool ValidateCurrentStepsDescription( CString s, CString &sErrorOut ) static bool ValidateCurrentStepsDescription( CString s, CString &sErrorOut )
{ {
if( GAMESTATE->m_pCurSteps[0]->GetDifficulty() == DIFFICULTY_EDIT ) ASSERT( GAMESTATE->m_pCurSteps[0]->GetDifficulty() == DIFFICULTY_EDIT );
if( s.empty() )
{ {
if( !GAMESTATE->m_pCurSong->IsEditDescriptionUnique(GAMESTATE->m_pCurSteps[0]->m_StepsType, s, GAMESTATE->m_pCurSteps[0]) ) sErrorOut = "You must supply a name for your new edit.";
{ return false;
sErrorOut = "The supplied name supplied conflicts with another edit.\n\nPlease use a different name.";
return false;
}
} }
if( !GAMESTATE->m_pCurSong->IsEditDescriptionUnique(GAMESTATE->m_pCurSteps[0]->m_StepsType, s, GAMESTATE->m_pCurSteps[0]) )
{
sErrorOut = "The supplied name supplied conflicts with another edit.\n\nPlease use a different name.";
return false;
}
return true; return true;
} }
@@ -236,7 +242,7 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn )
CString sEditName; CString sEditName;
if( pSourceSteps ) if( pSourceSteps )
{ {
pSteps->CopyFrom( pSourceSteps, st ); pSteps->CopyFrom( pSourceSteps, st, pSong->m_fMusicLengthSeconds );
sEditName = GetCopyDescription(pSourceSteps); sEditName = GetCopyDescription(pSourceSteps);
} }
else else