Require reasons for checkpoints.

This commit is contained in:
Jason Felds
2015-06-08 18:37:13 -04:00
parent 8b7370ee10
commit 80542a5a7d
16 changed files with 103 additions and 95 deletions
+15 -15
View File
@@ -403,15 +403,17 @@ float Profile::GetSongsActual( StepsType st, Difficulty dc ) const
CHECKPOINT_M( ssprintf("Profile::GetSongsActual: n %s = %p", sid.ToString().c_str(), pSteps) );
if( pSteps->GetDifficulty() != dc )
{
continue; // skip
CHECKPOINT;
}
CHECKPOINT_M( ssprintf("Profile::GetSongsActual: difficulty %s is correct", DifficultyToString(dc).c_str()));
const HighScoresForASteps& h = j->second;
const HighScoreList& hsl = h.hsl;
fTotalPercents += hsl.GetTopScore().GetPercentDP();
}
CHECKPOINT;
}
return fTotalPercents;
@@ -1066,8 +1068,6 @@ void Profile::LoadCustomFunction( RString sDir )
ProfileLoadResult Profile::LoadAllFromDir( RString sDir, bool bRequireSignature )
{
CHECKPOINT;
LOG->Trace( "Profile::LoadAllFromDir( %s )", sDir.c_str() );
ASSERT( sDir.Right(1) == "/" );
@@ -1829,7 +1829,7 @@ float Profile::CalculateCaloriesFromHeartRate(float HeartRate, float Duration)
XNode* Profile::SaveSongScoresCreateNode() const
{
CHECKPOINT;
CHECKPOINT_M("Getting the node to save song scores.");
const Profile* pProfile = this;
ASSERT( pProfile != NULL );
@@ -1873,7 +1873,7 @@ XNode* Profile::SaveSongScoresCreateNode() const
void Profile::LoadSongScoresFromNode( const XNode* pSongScores )
{
CHECKPOINT;
CHECKPOINT_M("Loading the node that contains song scores.");
ASSERT( pSongScores->GetName() == "SongScores" );
@@ -1912,7 +1912,7 @@ void Profile::LoadSongScoresFromNode( const XNode* pSongScores )
XNode* Profile::SaveCourseScoresCreateNode() const
{
CHECKPOINT;
CHECKPOINT_M("Getting the node to save course scores.");
const Profile* pProfile = this;
ASSERT( pProfile != NULL );
@@ -1952,7 +1952,7 @@ XNode* Profile::SaveCourseScoresCreateNode() const
void Profile::LoadCourseScoresFromNode( const XNode* pCourseScores )
{
CHECKPOINT;
CHECKPOINT_M("Loading the node that contains course scores.");
ASSERT( pCourseScores->GetName() == "CourseScores" );
@@ -2022,7 +2022,7 @@ void Profile::LoadCourseScoresFromNode( const XNode* pCourseScores )
XNode* Profile::SaveCategoryScoresCreateNode() const
{
CHECKPOINT;
CHECKPOINT_M("Getting the node that saves category scores.");
const Profile* pProfile = this;
ASSERT( pProfile != NULL );
@@ -2058,7 +2058,7 @@ XNode* Profile::SaveCategoryScoresCreateNode() const
void Profile::LoadCategoryScoresFromNode( const XNode* pCategoryScores )
{
CHECKPOINT;
CHECKPOINT_M("Loading the node that contains category scores.");
ASSERT( pCategoryScores->GetName() == "CategoryScores" );
@@ -2113,7 +2113,7 @@ void Profile::AddScreenshot( const Screenshot &screenshot )
void Profile::LoadScreenshotDataFromNode( const XNode* pScreenshotData )
{
CHECKPOINT;
CHECKPOINT_M("Loading the node containing screenshot data.");
ASSERT( pScreenshotData->GetName() == "ScreenshotData" );
FOREACH_CONST_Child( pScreenshotData, pScreenshot )
@@ -2130,7 +2130,7 @@ void Profile::LoadScreenshotDataFromNode( const XNode* pScreenshotData )
XNode* Profile::SaveScreenshotDataCreateNode() const
{
CHECKPOINT;
CHECKPOINT_M("Getting the node containing screenshot data.");
const Profile* pProfile = this;
ASSERT( pProfile != NULL );
@@ -2147,7 +2147,7 @@ XNode* Profile::SaveScreenshotDataCreateNode() const
void Profile::LoadCalorieDataFromNode( const XNode* pCalorieData )
{
CHECKPOINT;
CHECKPOINT_M("Loading the node containing calorie data.");
ASSERT( pCalorieData->GetName() == "CalorieData" );
FOREACH_CONST_Child( pCalorieData, pCaloriesBurned )
@@ -2172,7 +2172,7 @@ void Profile::LoadCalorieDataFromNode( const XNode* pCalorieData )
XNode* Profile::SaveCalorieDataCreateNode() const
{
CHECKPOINT;
CHECKPOINT_M("Getting the node containing calorie data.");
const Profile* pProfile = this;
ASSERT( pProfile != NULL );
@@ -2295,7 +2295,7 @@ bool Profile::IsMachine() const
XNode* Profile::SaveCoinDataCreateNode() const
{
CHECKPOINT;
CHECKPOINT_M("Getting the node containing coin data.");
const Profile* pProfile = this;
ASSERT( pProfile != NULL );