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

merge IniFile and XmlFile

Browse Source
This commit is contained in:
Chris Danford
2005-01-07 14:28:00 +00:00
parent 5b2582cab3
commit 981e52ec58
27 changed files with 427 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/BGAnimation.cpp
+7 -7
View File
@@ -77,10 +77,10 @@ void AddLayersFromAniDir( CString sAniDir, vector<Actor*> &layersAddTo, bool Gen
{
vector<CString> vsLayerNames;
for( IniFile::const_iterator iter = ini.begin(); iter != ini.end(); iter++ )
FOREACH_CONST_Child( &ini, pLayer )
{
if( strncmp(iter->first, "Layer", 5) == 0 )
vsLayerNames.push_back( iter->first );
if( strncmp(pLayer->m_sName, "Layer", 5) == 0 )
vsLayerNames.push_back( pLayer->m_sName );
}
sort( vsLayerNames.begin(), vsLayerNames.end(), CompareLayerNames );
@@ -88,15 +88,15 @@ void AddLayersFromAniDir( CString sAniDir, vector<Actor*> &layersAddTo, bool Gen
FOREACH_CONST( CString, vsLayerNames, s )
{
const CString sLayer = *s;
const IniFile::key* pKey = ini.GetKey( sLayer );
const CString &sLayer = *s;
const XNode* pKey = ini.GetChild( sLayer );
ASSERT( pKey );
CString sImportDir;
if( ini.GetValue(sLayer, "Import", sImportDir) )
if( pKey->GetAttrValue("Import", sImportDir) )
{
CString expr;
if( ini.GetValue(sLayer,"Condition",expr) )
if( pKey->GetAttrValue("Condition",expr) )
{
if( !Lua::RunExpressionB( expr ) )
continue;