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

Fix compile, put in the right spot. Thanks Henke.

Browse Source
This commit is contained in:
Jason Felds
2013-05-20 18:12:36 -04:00
parent c6ec5a4390
commit 9c61d060f0
3 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NotesLoaderDWI.cpp
-12
View File
@@ -744,18 +744,6 @@ bool DWILoader::LoadFromDir( const RString &sPath_, Song &out, set<RString> &Bla
}
}
if (out.m_sArtist == "The Dancing Monkeys Project" && out.m_sMainTitle.find_first_of('-') != string::npos)
{
// Dancing Monkeys had a bug/feature where the artist was replaced. Restore it.
vector<RString> titleParts;
split(out.m_sMainTitle, "-", titleParts);
out.m_sArtist = titleParts.front;
Trim(out.m_sArtist);
titleParts.erase(titleParts.begin());
out.m_sMainTitle = join("-", titleParts);
Trim(out.m_sMainTitle);
}
return true;
}
src/NotesLoaderSM.cpp
-12
View File
@@ -965,18 +965,6 @@ bool SMLoader::LoadFromSimfile( const RString &sPath, Song &out, bool bFromCache
LOG->UserLog( "Song file", sPath, "has an unexpected value named \"%s\".", sValueName.c_str() );
}
if (out.m_sArtist == "The Dancing Monkeys Project" && out.m_sMainTitle.find_first_of('-') != string::npos)
{
// Dancing Monkeys had a bug/feature where the artist was replaced. Restore it.
vector<RString> titleParts;
split(out.m_sMainTitle, "-", titleParts);
out.m_sArtist = titleParts.front;
Trim(out.m_sArtist);
titleParts.erase(titleParts.begin());
out.m_sMainTitle = join("-", titleParts);
Trim(out.m_sMainTitle);
}
// Turn negative time changes into warps
ProcessBPMsAndStops(out.m_SongTiming, vBPMChanges, vStops);
out.m_SongTiming.SortSegments( SEGMENT_WARP );
src/Song.cpp
+12
View File
@@ -465,6 +465,18 @@ void Song::TidyUpData( bool fromCache, bool /* duringCache */ )
FixupPath( m_sBackgroundFile, m_sSongDir );
FixupPath( m_sCDTitleFile, m_sSongDir );
if (this->m_sArtist == "The Dancing Monkeys Project" && this->m_sMainTitle.find_first_of('-') != string::npos)
{
// Dancing Monkeys had a bug/feature where the artist was replaced. Restore it.
vector<RString> titleParts;
split(this->m_sMainTitle, "-", titleParts);
this->m_sArtist = titleParts.front();
Trim(this->m_sArtist);
titleParts.erase(titleParts.begin());
this->m_sMainTitle = join("-", titleParts);
Trim(this->m_sMainTitle);
}
if( !HasMusic() )
{
vector<RString> arrayPossibleMusic;