From 5a4d403daf90a591a16ff6172d74402d6db477bd Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 22 Feb 2003 00:21:45 +0000 Subject: [PATCH] reenable translation for songs that already have translits too many songs have hacked titles with translits --- stepmania/src/Song.cpp | 2 +- stepmania/src/TitleSubstitution.cpp | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp index 4060b71b35..b398a9d771 100644 --- a/stepmania/src/Song.cpp +++ b/stepmania/src/Song.cpp @@ -41,7 +41,7 @@ #include "SDL_image.h" -const int FILE_CACHE_VERSION = 111; // increment this when Song or Notes changes to invalidate cache +const int FILE_CACHE_VERSION = 112; // increment this when Song or Notes changes to invalidate cache const float DEFAULT_MUSIC_SAMPLE_LENGTH = 12.f; diff --git a/stepmania/src/TitleSubstitution.cpp b/stepmania/src/TitleSubstitution.cpp index e52c766faa..bb45f93ca0 100644 --- a/stepmania/src/TitleSubstitution.cpp +++ b/stepmania/src/TitleSubstitution.cpp @@ -47,20 +47,22 @@ void TitleSubst::Subst(CString &title, CString &subtitle, CString &artist, continue; /* The song matches. Replace whichever strings aren't empty. - * Don't replace any that already have a transliteration set. */ - if(!ttab[i]->TitleTo.empty() && ttitle.empty()) + * Don't replace any that already have a transliteration set. + * Wait, do; too many songs have translits set with hacked + * titles. */ + if(!ttab[i]->TitleTo.empty()) // && ttitle.empty()) { if(ttab[i]->translit) ttitle = title; title = ttab[i]->TitleTo; FontCharAliases::ReplaceMarkers( title ); } - if(!ttab[i]->SubTo.empty() && tsubtitle.empty()) + if(!ttab[i]->SubTo.empty()) // && tsubtitle.empty()) { if(ttab[i]->translit) tsubtitle = subtitle; subtitle = ttab[i]->SubTo; FontCharAliases::ReplaceMarkers( subtitle ); } - if(!ttab[i]->ArtistTo.empty() && tartist.empty()) + if(!ttab[i]->ArtistTo.empty()) // && tartist.empty()) { if(ttab[i]->translit) tartist = artist; artist = ttab[i]->ArtistTo;