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

Changed blank music file check in Song::LoadFromSongDir to allow a blank music file if the song uses keysounds. The intent is to prevent bms files from triggering the condition, so they don't have to hit the song folder every time during loading.

Browse Source
This commit is contained in:
Kyzentun Keeslala
2015-10-11 13:54:13 -06:00
parent 66edc2d233
commit 337297f4b6
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Song.cpp
+1 -1
View File
@@ -316,7 +316,7 @@ bool Song::LoadFromSongDir( RString sDir, bool load_autosave )
loaderSM.LoadFromSimfile( sCacheFilePath, *this, true );
loaderSM.TidyUpData( *this, true );
}
if(m_sMainTitle == "" || m_sMusicFile == "")
if(m_sMainTitle == "" || (m_sMusicFile == "" && m_vsKeysoundFile.empty()))
{
LOG->Warn("Main title or music file for '%s' came up blank, forced to fall back on TidyUpData to fix title and paths. Do not use # or ; in a song title.", m_sSongDir.c_str());
// Tell TidyUpData that it's not loaded from the cache because it needs