null -> nullptr

etternagame · Nov 30, 2018 · 00c04d4 · 00c04d4
1 parent 21d4393
commit 00c04d4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/ScoreManager.cpp b/src/ScoreManager.cpp
@@ -226,6 +226,16 @@ ScoresForChart::SetTopScores()
 			eligiblescores.emplace_back(hs);
 	}
 
+	if (eligiblescores.size() < 2) {
+		FOREACHM(int, ScoresAtRate, ScoresByRate, i)
+		{
+			auto& hs = i->second.PBptr;
+			if (hs && hs->GetSSRCalcVersion() == GetCalcVersion() &&
+				hs->GetEtternaValid() && hs->GetGrade() != Grade_Failed)
+				eligiblescores.emplace_back(hs);
+		}
+	}
+
 	if (eligiblescores.empty())
 		return;
 

diff --git a/src/SongManager.cpp b/src/SongManager.cpp
@@ -637,15 +637,15 @@ SongManager::GetStepsByChartkey(RString ck)
 {
 	if (StepsByKey.count(ck))
 		return StepsByKey[ck];
-	return NULL;
+	return nullptr;
 }
 
 Song*
 SongManager::GetSongByChartkey(RString ck)
 {
 	if (SongsByKey.count(ck))
 		return SongsByKey[ck];
-	return NULL;
+	return nullptr;
 }
 
 static LocalizedString FOLDER_CONTAINS_MUSIC_FILES(