aboutsummaryrefslogtreecommitdiffstats
path: root/src/screens/UScreenSing.pas
diff options
context:
space:
mode:
authorwhiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-10-09 17:57:10 +0000
committerwhiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-10-09 17:57:10 +0000
commit528d8cd40ec3763bb3018da4829803404d1cd04b (patch)
tree74c212237f2360bdeb18b9e3e3a19dcd6748d7d8 /src/screens/UScreenSing.pas
parent721776f85625ab218cff2d8156e80522f5381045 (diff)
downloadusdx-528d8cd40ec3763bb3018da4829803404d1cd04b.tar.gz
usdx-528d8cd40ec3763bb3018da4829803404d1cd04b.tar.xz
usdx-528d8cd40ec3763bb3018da4829803404d1cd04b.zip
Errormessages during songload now translatable
German and English translations updated Added four new language strings: ERROR_CORRUPT_SONG_FILE_NOT_FOUND ERROR_CORRUPT_SONG_NO_NOTES ERROR_CORRUPT_SONG_NO_BREAKS ERROR_CORRUPT_SONG_UNKNOWN_IN_LINE git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1443 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src/screens/UScreenSing.pas')
-rw-r--r--src/screens/UScreenSing.pas6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/screens/UScreenSing.pas b/src/screens/UScreenSing.pas
index 3eb3742d..d0908ff8 100644
--- a/src/screens/UScreenSing.pas
+++ b/src/screens/UScreenSing.pas
@@ -441,7 +441,7 @@ begin
if ScreenSong.Mode = smPartyMode then
ScreenSong.SelectRandomSong();
if (Length(CurrentSong.LastError) > 0) then
- ScreenPopupError.ShowPopup(Language.Translate('ERROR_CORRUPT_SONG') + '\n' + CurrentSong.LastError)
+ ScreenPopupError.ShowPopup(Format(Language.Translate(CurrentSong.LastError), [CurrentSong.ErrorLineNo]))
else
ScreenPopupError.ShowPopup(Language.Translate('ERROR_CORRUPT_SONG'));
// FIXME: do we need this?
@@ -656,6 +656,8 @@ begin
glDeleteTextures(1, PGLuint(@Tex_Background.TexNum));
Tex_Background.TexNum := 0;
end;
+
+ Background.OnFinish;
end;
function TScreenSing.Draw: boolean;
@@ -669,6 +671,8 @@ var
CurLyricsTime: real;
begin
+ Background.Draw;
+
// set player names (for 2 screens and only Singstar skin)
if ScreenAct = 1 then
begin