actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2004-02-22 07:07:03 +00:00
parent 7bcbe86e33
commit 376ca15029
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Profile.cpp
+18 -7
View File
@@ -44,6 +44,17 @@ const int SM_390A12_SONG_SCORES_VERSION = 9;
const int SM_390A12_COURSE_SCORES_VERSION = 8; const int SM_390A12_COURSE_SCORES_VERSION = 8;
#if defined(WIN32)
#pragma warning (disable : 4706) // assignment within conditional expression
#endif
#define FOREACH_Node( Node, Var ) \
XNodes::const_iterator Var##Iter; \
const XNode *Var = NULL; \
for( Var##Iter = Node->childs.begin(); \
(Var##Iter != Node->childs.end() && (Var = *Var##Iter) ), Var##Iter != Node->childs.end(); \
++Var##Iter )
void Profile::InitEditableData() void Profile::InitEditableData()
{ {
@@ -575,28 +586,28 @@ void Profile::LoadGeneralDataFromNode( const XNode* pNode )
{ {
XNode* pNumSongsPlayedByStyle = pNode->GetChild("NumSongsPlayedByStyle"); XNode* pNumSongsPlayedByStyle = pNode->GetChild("NumSongsPlayedByStyle");
if( pNumSongsPlayedByStyle ) if( pNumSongsPlayedByStyle )
for( XNodes::const_iterator style = pNumSongsPlayedByStyle->childs.begin(); {
style != pNumSongsPlayedByStyle->childs.end(); FOREACH_Node( pNumSongsPlayedByStyle, style )
style++ )
{ {
if( (*style)->name != "Style" ) if( style->name != "Style" )
continue; continue;
CString sGame; CString sGame;
if( !(*style)->GetAttrValue( "Game", sGame ) ) if( !style->GetAttrValue( "Game", sGame ) )
WARN_AND_CONTINUE; WARN_AND_CONTINUE;
Game g = GAMEMAN->StringToGameType( sGame ); Game g = GAMEMAN->StringToGameType( sGame );
if( g == GAME_INVALID ) if( g == GAME_INVALID )
WARN_AND_CONTINUE; WARN_AND_CONTINUE;
CString sStyle; CString sStyle;
if( !(*style)->GetAttrValue( "Style", sStyle ) ) if( !style->GetAttrValue( "Style", sStyle ) )
WARN_AND_CONTINUE; WARN_AND_CONTINUE;
Style s = GAMEMAN->GameAndStringToStyle( g, sStyle ); Style s = GAMEMAN->GameAndStringToStyle( g, sStyle );
(*style)->GetValue( m_iNumSongsPlayedByStyle[s] ); style->GetValue( m_iNumSongsPlayedByStyle[s] );
} }
}
} }
{ {