bug fix: HighScores for edits don't match correctly because the hash is ignored

stepmania/src/Song.cpp

@@ -833,6 +833,7 @@ void Song::GetSteps(
 	int iMeterHigh, 
 	const CString &sDescription, 
 	bool bIncludeAutoGen, 
+	unsigned uHash,
 	int iMaxToGet 
 	) const
 {
@@ -852,6 +853,8 @@ void Song::GetSteps(
 			continue;
 		if( sDescription.size() && sDescription != pSteps->GetDescription() )
 			continue;
+		if( uHash != 0 && uHash != pSteps->GetHash() )
+			continue;
 		if( !bIncludeAutoGen && pSteps->IsAutogen() )
 			continue;
 
@@ -872,11 +875,12 @@ Steps* Song::GetSteps(
 	int iMeterLow, 
 	int iMeterHigh, 
 	const CString &sDescription, 
+	unsigned uHash,
 	bool bIncludeAutoGen
 	) const
 {
 	vector<Steps*> vpSteps;
-	GetSteps( vpSteps, st, dc, iMeterLow, iMeterHigh, sDescription, bIncludeAutoGen, 1 );	// get max 1
+	GetSteps( vpSteps, st, dc, iMeterLow, iMeterHigh, sDescription, bIncludeAutoGen, uHash, 1 );	// get max 1
 	if( vpSteps.empty() )
 		return NULL;
 	else

stepmania/src/StepsUtil.cpp

@@ -157,11 +157,11 @@ Steps *StepsID::ToSteps( const Song *p, bool bAllowNull, bool bUseCache ) const
 	Steps *ret = NULL;
 	if( dc == DIFFICULTY_EDIT )
 	{
-		ret = p->GetSteps( st, dc, -1, -1, sDescription, true );
+		ret = p->GetSteps( st, dc, -1, -1, sDescription, uHash, true );
 	}
 	else
 	{
-		ret = p->GetSteps( st, dc, -1, -1, "", true );
+		ret = p->GetSteps( st, dc, -1, -1, "", 0, true );
 	}
 	
 	if( !bAllowNull )

stepmania/src/song.h

@@ -181,6 +181,7 @@ public:
 		int iMeterHigh = -1, 
 		const CString &sDescription = "", 
 		bool bIncludeAutoGen = true, 
+		unsigned uHash = 0,
 		int iMaxToGet = -1 
 		) const;
 	Steps* GetSteps( 
@@ -189,6 +190,7 @@ public:
 		int iMeterLow = -1, 
 		int iMeterHigh = -1, 
 		const CString &sDescription = "", 
+		unsigned uHash = 0,
 		bool bIncludeAutoGen = true
 		) const;
 	Steps* GetStepsByDifficulty( StepsType st, Difficulty dc, bool bIncludeAutoGen = true ) const;