reenable translation for songs that already have translits

too many songs have hacked titles with translits
This commit is contained in:
Glenn Maynard
2003-02-22 00:21:45 +00:00
parent 56559fb29d
commit 5a4d403daf
2 changed files with 7 additions and 5 deletions
+1 -1
View File
@@ -41,7 +41,7 @@
#include "SDL_image.h" #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; const float DEFAULT_MUSIC_SAMPLE_LENGTH = 12.f;
+6 -4
View File
@@ -47,20 +47,22 @@ void TitleSubst::Subst(CString &title, CString &subtitle, CString &artist,
continue; continue;
/* The song matches. Replace whichever strings aren't empty. /* The song matches. Replace whichever strings aren't empty.
* Don't replace any that already have a transliteration set. */ * Don't replace any that already have a transliteration set.
if(!ttab[i]->TitleTo.empty() && ttitle.empty()) * Wait, do; too many songs have translits set with hacked
* titles. */
if(!ttab[i]->TitleTo.empty()) // && ttitle.empty())
{ {
if(ttab[i]->translit) ttitle = title; if(ttab[i]->translit) ttitle = title;
title = ttab[i]->TitleTo; title = ttab[i]->TitleTo;
FontCharAliases::ReplaceMarkers( title ); FontCharAliases::ReplaceMarkers( title );
} }
if(!ttab[i]->SubTo.empty() && tsubtitle.empty()) if(!ttab[i]->SubTo.empty()) // && tsubtitle.empty())
{ {
if(ttab[i]->translit) tsubtitle = subtitle; if(ttab[i]->translit) tsubtitle = subtitle;
subtitle = ttab[i]->SubTo; subtitle = ttab[i]->SubTo;
FontCharAliases::ReplaceMarkers( subtitle ); FontCharAliases::ReplaceMarkers( subtitle );
} }
if(!ttab[i]->ArtistTo.empty() && tartist.empty()) if(!ttab[i]->ArtistTo.empty()) // && tartist.empty())
{ {
if(ttab[i]->translit) tartist = artist; if(ttab[i]->translit) tartist = artist;
artist = ttab[i]->ArtistTo; artist = ttab[i]->ArtistTo;