create SongID, StepsID

stepmania/src/ScreenEdit.cpp

@@ -1416,13 +1416,14 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
 			return;
 
 		const StepsType st = m_pNotes->m_StepsType;
-		const CString id = m_pNotes->GetID();
+		StepsID id;
+		id.FromSteps( m_pNotes );
 
 		GAMESTATE->m_pCurNotes[PLAYER_1] = NULL; /* make RevertFromDisk not try to reset it */
 		GAMESTATE->m_pCurSong->RevertFromDisk();
 
 		CString sMessage = "Reloaded from disk.";
-		Steps *pSteps = GAMESTATE->m_pCurSong->GetStepsByID( st, id, false );
+		Steps *pSteps = id.ToSteps( GAMESTATE->m_pCurSong, false );
 
 		/* If we couldn't find the steps we were on before, warn and use the first available. */
 		if( pSteps == NULL )
@@ -1430,8 +1431,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
 			pSteps = GAMESTATE->m_pCurSong->GetStepsByDifficulty( st, DIFFICULTY_INVALID, false );
 
 			if( pSteps )
-				sMessage = ssprintf( "%s steps not found; changed to %s.",
+				sMessage = ssprintf( "old steps not found; changed to %s.",
-					Capitalize(id).c_str(),
 					DifficultyToString(pSteps->GetDifficulty()).c_str() );
 		}
 

stepmania/src/Song.cpp

@@ -280,39 +280,6 @@ bool Song::LoadFromSongDir( CString sDir )
 }
 
 
-class StepsID
-{
-	StepsType st;
-	CString id;
-
-public:
-	StepsID() { SetFrom(NULL); }
-	void SetFrom( const Steps *p )
-	{
-		if( p == NULL )
-		{
-			st = STEPS_TYPE_INVALID;
-			id = "";
-		}
-		else
-		{
-			st = p->m_StepsType;
-			id = p->GetID();
-		}
-	}
-	Steps *GetSteps( const Song *p, bool bAllowNull ) const
-	{
-		if( st == STEPS_TYPE_INVALID || id == "" )
-			return NULL;
-		Steps *ret = p->GetStepsByID( st, id, true );
-		if( !bAllowNull )
-		{
-			RAGE_ASSERT_M( ret, ssprintf("%i, \"%s\"", st, id.c_str()) );	// we had something selected before reloading, so it better still be there after!
-		}
-		return ret;
-	}
-};
-
 /* If bAllowNotesLoss is true, any global notes pointers which no longer exist
  * (or exist but couldn't be matched) will be set to NULL.  This is used when
  * reverting out of the editor.  If false, this is unexpected and will assert.
@@ -329,12 +296,12 @@ void Song::RevertFromDisk( bool bAllowNotesLoss )
 	vector<StepsID> OldPlayedStageStats[NUM_PLAYERS];
 	for( int p = 0; p < NUM_PLAYERS; ++p )
 	{
-		OldCurNotes[p].SetFrom( GAMESTATE->m_pCurNotes[p] );
+		OldCurNotes[p].FromSteps( GAMESTATE->m_pCurNotes[p] );
-		OldCurStageStats[p].SetFrom( g_CurStageStats.pSteps[p] );
+		OldCurStageStats[p].FromSteps( g_CurStageStats.pSteps[p] );
 		for( unsigned i = 0; i < g_vPlayedStageStats.size(); ++i )
 		{
 			OldPlayedStageStats[p].push_back( StepsID() );
-			OldPlayedStageStats[p][i].SetFrom( g_vPlayedStageStats[i].pSteps[p] );
+			OldPlayedStageStats[p][i].FromSteps( g_vPlayedStageStats[i].pSteps[p] );
 		}
 	}
 
@@ -358,16 +325,16 @@ void Song::RevertFromDisk( bool bAllowNotesLoss )
 		{
 			CHECKPOINT;
 			if( GAMESTATE->m_pCurSong == this )
-				GAMESTATE->m_pCurNotes[p] = OldCurNotes[p].GetSteps( this, bAllowNotesLoss );
+				GAMESTATE->m_pCurNotes[p] = OldCurNotes[p].ToSteps( this, bAllowNotesLoss );
 			CHECKPOINT;
 			if( g_CurStageStats.pSong == this )
-				g_CurStageStats.pSteps[p] = OldCurStageStats[p].GetSteps( this, bAllowNotesLoss );
+				g_CurStageStats.pSteps[p] = OldCurStageStats[p].ToSteps( this, bAllowNotesLoss );
 			CHECKPOINT;
 			for( unsigned i = 0; i < g_vPlayedStageStats.size(); ++i )
 			{
 			CHECKPOINT_M(ssprintf("%i", i));
 				if( g_vPlayedStageStats[i].pSong == this )
-					g_vPlayedStageStats[i].pSteps[p] = OldPlayedStageStats[p][i].GetSteps( this, bAllowNotesLoss );
+					g_vPlayedStageStats[i].pSteps[p] = OldPlayedStageStats[p][i].ToSteps( this, bAllowNotesLoss );
 			}
 		}
 	}
@@ -940,31 +907,6 @@ Steps* Song::GetStepsByMeter( StepsType nt, int iMeterLow, int iMeterHigh ) cons
 		return vNotes[0];
 }
 
-/* sID is a difficulty name (for non-edits) or a description (for edits).  This allows
- * specifying a specific notes by a single string.
- *
- * XXX: Don't allow duplicate edit descriptions, and don't allow edit descriptions
- * to be difficulty names (eg. "Hard").  If we do that, this will be completely unambiguous.
- *
- * XXX: Unless two memcards are inserted and there's overlap in the names.  In that
- * case, maybe both edits should be renamed to "Pn: foo"; as long as we don't write
- * them back out (which we don't do except in the editor), it won't be permanent. 
- * We could do this during the actual Steps::GetID() call, instead, but then it'd have
- * to have access to Song::m_LoadedFromProfile. */
-Steps* Song::GetStepsByID( StepsType nt, CString sID, bool bIncludeAutoGen ) const
-{
-	vector<Steps*> vNotes;
-	Difficulty dc = StringToDifficulty(sID);
-	if( dc != DIFFICULTY_INVALID && DIFFICULTY_EDIT )
-		GetSteps( vNotes, nt, dc, -1, -1, "", bIncludeAutoGen );
-	else
-		GetSteps( vNotes, nt, DIFFICULTY_EDIT, -1, -1, sID, bIncludeAutoGen );
-	if( vNotes.size() == 0 )
-		return NULL;
-	else 
-		return vNotes[0];
-}
-
 Steps* Song::GetStepsByDescription( StepsType nt, CString sDescription ) const
 {
 	vector<Steps*> vNotes;

stepmania/src/Steps.h

@@ -39,16 +39,6 @@ public:
 	bool WasLoadedFromProfile() const { return m_LoadedFromProfile != PROFILE_SLOT_INVALID; }
 	CString GetDescription() const { return Real()->m_sDescription; }
 	Difficulty GetDifficulty() const { return Real()->m_Difficulty; }
-	CString GetID() const /* used for Song::GetStepsByID */
-	{
-		Difficulty dc = GetDifficulty();
-		ASSERT( dc != DIFFICULTY_INVALID );
-
-		if( dc == DIFFICULTY_EDIT )
-			return GetDescription();
-		else
-			return DifficultyToString(dc);
-	}
 	int GetMeter() const { return Real()->m_iMeter; }
 	const RadarValues& GetRadarValues() const { return Real()->m_RadarValues; }
 

stepmania/src/song.h

@@ -21,6 +21,7 @@ class StyleDef;
 class NotesLoader;
 class LyricsLoader;
 class Profile;
+class StepsID;
 
 
 extern const int FILE_CACHE_VERSION;
@@ -187,7 +188,6 @@ public:
 	Steps* GetStepsByDifficulty( StepsType nt, Difficulty dc, bool bIncludeAutoGen = true ) const;
 	Steps* GetStepsByMeter( StepsType nt, int iMeterLow, int iMeterHigh ) const;
 	Steps* GetStepsByDescription( StepsType nt, CString sDescription ) const;
-	Steps* GetStepsByID( StepsType nt, CString sID, bool bIncludeAutoGen = true ) const;
 	Steps* GetClosestNotes( StepsType nt, Difficulty dc ) const;
 	void GetEdits( vector<Steps*>& arrayAddTo, StepsType nt ) const;
 	bool IsEasy( StepsType nt ) const;