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

re-clamp the description when changing the difficulty

Browse Source
This commit is contained in:
Chris Danford
2005-04-13 08:45:00 +00:00
parent de2daa5410
commit 04715f4dd3
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NotesLoaderBMS.cpp
+5 -2
View File
@@ -237,11 +237,14 @@ void BMSLoader::SearchForDifficulty( CString sTag, Steps *pOut )
/* Only match "Light" in parentheses. */ /* Only match "Light" in parentheses. */
if( sTag.find( "(light" ) != sTag.npos ) if( sTag.find( "(light" ) != sTag.npos )
{
pOut->SetDifficulty( DIFFICULTY_EASY ); pOut->SetDifficulty( DIFFICULTY_EASY );
}
else if( sTag.find( "another" ) != sTag.npos ) else if( sTag.find( "another" ) != sTag.npos )
{
pOut->SetDifficulty( DIFFICULTY_HARD ); pOut->SetDifficulty( DIFFICULTY_HARD );
}
if( sTag.find( "(solo)" ) != sTag.npos ) else if( sTag.find( "(solo)" ) != sTag.npos )
{ {
pOut->SetDescription( "Solo" ); pOut->SetDescription( "Solo" );
pOut->SetDifficulty( DIFFICULTY_EDIT ); pOut->SetDifficulty( DIFFICULTY_EDIT );
stepmania/src/Steps.cpp
+3 -8
View File
@@ -322,10 +322,11 @@ void Steps::SetFile( CString fn )
m_sFilename = fn; m_sFilename = fn;
} }
void Steps::SetDescription(CString desc) void Steps::SetDifficultyAndDescription( Difficulty dc, CString sDescription )
{ {
DeAutogen(); DeAutogen();
m_sDescription = desc; m_Difficulty = dc;
m_sDescription = sDescription;
if( GetDifficulty() == DIFFICULTY_EDIT ) if( GetDifficulty() == DIFFICULTY_EDIT )
MakeValidEditDescription( m_sDescription ); MakeValidEditDescription( m_sDescription );
} }
@@ -340,12 +341,6 @@ bool Steps::MakeValidEditDescription( CString &sPreferredDescription )
return false; return false;
} }
void Steps::SetDifficulty(Difficulty d)
{
DeAutogen();
m_Difficulty = d;
}
void Steps::SetMeter(int meter) void Steps::SetMeter(int meter)
{ {
DeAutogen(); DeAutogen();
stepmania/src/Steps.h
+3 -2
View File
@@ -43,10 +43,11 @@ public:
void SetFile( CString fn ); void SetFile( CString fn );
void SetSavedToDisk( bool b ) { m_bSavedToDisk = b; } void SetSavedToDisk( bool b ) { m_bSavedToDisk = b; }
bool GetSavedToDisk() { return m_bSavedToDisk; } bool GetSavedToDisk() { return m_bSavedToDisk; }
void SetDescription(CString desc); void SetDifficultyAndDescription( Difficulty dc, CString sDescription );
void SetDifficulty( Difficulty dc ) { SetDifficultyAndDescription( dc, this->GetDescription() ); }
void SetDescription( CString sDescription ) { SetDifficultyAndDescription( this->GetDifficulty(), sDescription ); }
static bool MakeValidEditDescription( CString &sPreferredDescription ); // return true if was modified static bool MakeValidEditDescription( CString &sPreferredDescription ); // return true if was modified
void SetDifficulty(Difficulty d);
void SetLoadedFromProfile( ProfileSlot slot ) { m_LoadedFromProfile = slot; } void SetLoadedFromProfile( ProfileSlot slot ) { m_LoadedFromProfile = slot; }
void SetMeter(int meter); void SetMeter(int meter);
void SetRadarValues( const RadarValues& v ); void SetRadarValues( const RadarValues& v );