const fixes

This commit is contained in:
Glenn Maynard
2004-07-23 02:27:07 +00:00
parent b1af78b878
commit 6dc160f9de
2 changed files with 13 additions and 13 deletions
+4 -4
View File
@@ -80,15 +80,15 @@ void HighScore::LoadFromNode( const XNode* pNode )
pNode->GetChildValue( "PlayerGuid", sPlayerGuid ); pNode->GetChildValue( "PlayerGuid", sPlayerGuid );
pNode->GetChildValue( "MachineGuid", sMachineGuid ); pNode->GetChildValue( "MachineGuid", sMachineGuid );
pNode->GetChildValue( "ProductID", iProductID ); pNode->GetChildValue( "ProductID", iProductID );
XNode* pTapNoteScores = pNode->GetChild( "TapNoteScores" ); const XNode* pTapNoteScores = pNode->GetChild( "TapNoteScores" );
if( pTapNoteScores ) if( pTapNoteScores )
FOREACH_TapNoteScore( tns ) FOREACH_TapNoteScore( tns )
pTapNoteScores->GetChildValue( TapNoteScoreToString(tns), iTapNoteScores[tns] ); pTapNoteScores->GetChildValue( TapNoteScoreToString(tns), iTapNoteScores[tns] );
XNode* pHoldNoteScores = pNode->GetChild( "HoldNoteScores" ); const XNode* pHoldNoteScores = pNode->GetChild( "HoldNoteScores" );
if( pHoldNoteScores ) if( pHoldNoteScores )
FOREACH_HoldNoteScore( hns ) FOREACH_HoldNoteScore( hns )
pHoldNoteScores->GetChildValue( HoldNoteScoreToString(hns), iHoldNoteScores[hns] ); pHoldNoteScores->GetChildValue( HoldNoteScoreToString(hns), iHoldNoteScores[hns] );
XNode* pRadarValues = pNode->GetChild( "RadarValues" ); const XNode* pRadarValues = pNode->GetChild( "RadarValues" );
if( pRadarValues ) if( pRadarValues )
radarValues.LoadFromNode( pRadarValues ); radarValues.LoadFromNode( pRadarValues );
@@ -205,7 +205,7 @@ void Screenshot::LoadFromNode( const XNode* pNode )
pNode->GetChildValue( "FileName", sFileName ); pNode->GetChildValue( "FileName", sFileName );
pNode->GetChildValue( "MD5", sMD5 ); pNode->GetChildValue( "MD5", sMD5 );
XNode* pHighScore = pNode->GetChild( "HighScore" ); const XNode* pHighScore = pNode->GetChild( "HighScore" );
if( pHighScore ) if( pHighScore )
highScore.LoadFromNode( pHighScore ); highScore.LoadFromNode( pHighScore );
} }
+9 -9
View File
@@ -894,7 +894,7 @@ void Profile::LoadGeneralDataFromNode( const XNode* pNode )
pNode->GetChildValue( "TotalHands", m_iTotalHands ); pNode->GetChildValue( "TotalHands", m_iTotalHands );
{ {
XNode* pUnlockedSongs = pNode->GetChild("UnlockedSongs"); const XNode* pUnlockedSongs = pNode->GetChild("UnlockedSongs");
if( pUnlockedSongs ) if( pUnlockedSongs )
{ {
FOREACH_Node( pUnlockedSongs, song ) FOREACH_Node( pUnlockedSongs, song )
@@ -907,14 +907,14 @@ void Profile::LoadGeneralDataFromNode( const XNode* pNode )
} }
{ {
XNode* pNumSongsPlayedByPlayMode = pNode->GetChild("NumSongsPlayedByPlayMode"); const XNode* pNumSongsPlayedByPlayMode = pNode->GetChild("NumSongsPlayedByPlayMode");
if( pNumSongsPlayedByPlayMode ) if( pNumSongsPlayedByPlayMode )
FOREACH_PlayMode( pm ) FOREACH_PlayMode( pm )
pNumSongsPlayedByPlayMode->GetChildValue( PlayModeToString(pm), m_iNumSongsPlayedByPlayMode[pm] ); pNumSongsPlayedByPlayMode->GetChildValue( PlayModeToString(pm), m_iNumSongsPlayedByPlayMode[pm] );
} }
{ {
XNode* pNumSongsPlayedByStyle = pNode->GetChild("NumSongsPlayedByStyle"); const XNode* pNumSongsPlayedByStyle = pNode->GetChild("NumSongsPlayedByStyle");
if( pNumSongsPlayedByStyle ) if( pNumSongsPlayedByStyle )
{ {
FOREACH_Node( pNumSongsPlayedByStyle, style ) FOREACH_Node( pNumSongsPlayedByStyle, style )
@@ -934,28 +934,28 @@ void Profile::LoadGeneralDataFromNode( const XNode* pNode )
} }
{ {
XNode* pNumSongsPlayedByDifficulty = pNode->GetChild("NumSongsPlayedByDifficulty"); const XNode* pNumSongsPlayedByDifficulty = pNode->GetChild("NumSongsPlayedByDifficulty");
if( pNumSongsPlayedByDifficulty ) if( pNumSongsPlayedByDifficulty )
FOREACH_Difficulty( dc ) FOREACH_Difficulty( dc )
pNumSongsPlayedByDifficulty->GetChildValue( DifficultyToString(dc), m_iNumSongsPlayedByDifficulty[dc] ); pNumSongsPlayedByDifficulty->GetChildValue( DifficultyToString(dc), m_iNumSongsPlayedByDifficulty[dc] );
} }
{ {
XNode* pNumSongsPlayedByMeter = pNode->GetChild("NumSongsPlayedByMeter"); const XNode* pNumSongsPlayedByMeter = pNode->GetChild("NumSongsPlayedByMeter");
if( pNumSongsPlayedByMeter ) if( pNumSongsPlayedByMeter )
for( int i=0; i<MAX_METER+1; i++ ) for( int i=0; i<MAX_METER+1; i++ )
pNumSongsPlayedByMeter->GetChildValue( ssprintf("Meter%d",i), m_iNumSongsPlayedByMeter[i] ); pNumSongsPlayedByMeter->GetChildValue( ssprintf("Meter%d",i), m_iNumSongsPlayedByMeter[i] );
} }
{ {
XNode* pNumSongsPassedByGrade = pNode->GetChild("NumSongsPassedByGrade"); const XNode* pNumSongsPassedByGrade = pNode->GetChild("NumSongsPassedByGrade");
if( pNumSongsPassedByGrade ) if( pNumSongsPassedByGrade )
FOREACH_Grade( g ) FOREACH_Grade( g )
pNumSongsPassedByGrade->GetChildValue( GradeToString(g), m_iNumSongsPassedByGrade[g] ); pNumSongsPassedByGrade->GetChildValue( GradeToString(g), m_iNumSongsPassedByGrade[g] );
} }
{ {
XNode* pNumSongsPassedByPlayMode = pNode->GetChild("NumSongsPassedByPlayMode"); const XNode* pNumSongsPassedByPlayMode = pNode->GetChild("NumSongsPassedByPlayMode");
if( pNumSongsPassedByPlayMode ) if( pNumSongsPassedByPlayMode )
FOREACH_PlayMode( pm ) FOREACH_PlayMode( pm )
pNumSongsPassedByPlayMode->GetChildValue( PlayModeToString(pm), m_iNumSongsPassedByPlayMode[pm] ); pNumSongsPassedByPlayMode->GetChildValue( PlayModeToString(pm), m_iNumSongsPassedByPlayMode[pm] );
@@ -1512,7 +1512,7 @@ void Profile::HighScoreForASongAndSteps::LoadFromNode( const XNode* pNode )
Unset(); Unset();
ASSERT( pNode->name == "HighScoreForASongAndSteps" ); ASSERT( pNode->name == "HighScoreForASongAndSteps" );
XNode* p; const XNode* p;
if( (p = pNode->GetChild("Song")) ) if( (p = pNode->GetChild("Song")) )
songID.LoadFromNode( p ); songID.LoadFromNode( p );
if( (p = pNode->GetChild("Steps")) ) if( (p = pNode->GetChild("Steps")) )
@@ -1589,7 +1589,7 @@ void Profile::HighScoreForACourseAndTrail::LoadFromNode( const XNode* pNode )
Unset(); Unset();
ASSERT( pNode->name == "HighScoreForACourseAndTrail" ); ASSERT( pNode->name == "HighScoreForACourseAndTrail" );
XNode* p; const XNode* p;
if( (p = pNode->GetChild("Course")) ) if( (p = pNode->GetChild("Course")) )
courseID.LoadFromNode( p ); courseID.LoadFromNode( p );
if( (p = pNode->GetChild("Trail")) ) if( (p = pNode->GetChild("Trail")) )