Fix compile, put in the right spot. Thanks Henke.
This commit is contained in:
@@ -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;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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() );
|
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
|
// Turn negative time changes into warps
|
||||||
ProcessBPMsAndStops(out.m_SongTiming, vBPMChanges, vStops);
|
ProcessBPMsAndStops(out.m_SongTiming, vBPMChanges, vStops);
|
||||||
out.m_SongTiming.SortSegments( SEGMENT_WARP );
|
out.m_SongTiming.SortSegments( SEGMENT_WARP );
|
||||||
|
|||||||
@@ -465,6 +465,18 @@ void Song::TidyUpData( bool fromCache, bool /* duringCache */ )
|
|||||||
FixupPath( m_sBackgroundFile, m_sSongDir );
|
FixupPath( m_sBackgroundFile, m_sSongDir );
|
||||||
FixupPath( m_sCDTitleFile, 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() )
|
if( !HasMusic() )
|
||||||
{
|
{
|
||||||
vector<RString> arrayPossibleMusic;
|
vector<RString> arrayPossibleMusic;
|
||||||
|
|||||||
Reference in New Issue
Block a user