Fix compile after rebasing develop on experiment branch

etternagame · Feb 10, 2018 · f5e8481 · f5e8481
1 parent 7889aed
commit f5e8481
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/src/HighScore.cpp b/src/HighScore.cpp
@@ -744,9 +744,6 @@ vector<float> HighScore::GetCopyOfOffsetVector() const { return m_Impl->vOffsetV
 vector<int> HighScore::GetCopyOfNoteRowVector() const { return m_Impl->vNoteRowVector; }
 const vector<float>& HighScore::GetOffsetVector() const { return m_Impl->vOffsetVector; }
 const vector<int>& HighScore::GetNoteRowVector() const { return m_Impl->vNoteRowVector; }
-bool HighScore::IsUploadedToServer(string s) const {
-	return find(m_Impl->uploaded.begin(), m_Impl->uploaded.end(), s) != m_Impl->uploaded.end();
-}
 string HighScore::GetScoreKey() const { return m_Impl->ScoreKey; }
 float HighScore::GetSurviveSeconds() const { return m_Impl->fSurviveSeconds; }
 float HighScore::GetSurvivalSeconds() const { return GetSurviveSeconds() + GetLifeRemainingSeconds(); }

diff --git a/src/Song.cpp b/src/Song.cpp
@@ -381,13 +381,6 @@ void Song::FinalizeLoading()
 			IMAGECACHE->LoadImage( Image, GetCacheFile( Image ) );
 		}
 	}
-
-	if( !m_bHasMusic )
-	{
-		LOG->UserLog( "Song", sDir, "has no music; ignored." );
-		return false;	// don't load this song
-	}
-	return true;	// do load this song
 }
 /* This function feels EXTREMELY hacky - copying things on top of pointers so
  * they don't break elsewhere.  Maybe it could be rewritten to politely ask the