read global data before reading notes

This commit is contained in:
Glenn Maynard
2003-05-19 19:58:46 +00:00
parent b629d71cd0
commit 32ca276305
+3 -3
View File
@@ -276,6 +276,9 @@ bool KSFLoader::LoadFromDir( CString sDir, Song &out )
if( arrayKSFFileNames.empty() )
RageException::Throw( "Couldn't find any KSF files in '%s'", sDir.c_str() );
if(!LoadGlobalData(out.GetSongDir() + arrayKSFFileNames[0], out))
return false;
// load the Notes from the rest of the KSF files
unsigned i;
for( i=0; i<arrayKSFFileNames.size(); i++ )
@@ -290,9 +293,6 @@ bool KSFLoader::LoadFromDir( CString sDir, Song &out )
out.m_apNotes.push_back( pNewNotes );
}
if(!LoadGlobalData(out.GetSongDir() + arrayKSFFileNames[0], out))
return false;
return true;
}