From a7d0970a2e7dec907fccbc2d63ffb5cb799a7505 Mon Sep 17 00:00:00 2001
From: brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sat, 30 Oct 2010 11:22:25 +0000
Subject: - correct drawing of short notes in 4/6-player mode on one screen -
 rimshot022b.mp3 + 15db - changed fonts: higher resolution esp. for medley
 countdown - some other bugfixes and corrections - update of installer files

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2699 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Game/Code/Screens/UScreenSing.pas | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'Game/Code/Screens/UScreenSing.pas')

diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas
index 0fa5227c..7f60fe95 100644
--- a/Game/Code/Screens/UScreenSing.pas
+++ b/Game/Code/Screens/UScreenSing.pas
@@ -1343,6 +1343,8 @@ end;
 procedure TScreenSing.LoadNextSong;
 var
   P, I:       integer;
+  C, N, beat: integer;
+  error:      boolean;
 
 begin
   // load notes
@@ -1383,6 +1385,23 @@ begin
   
   AktSong.Path := CatSongs.Song[CatSongs.Selected].Path;
 
+  error := false;
+  for P := 0 to Length(Czesci) - 1 do
+  begin
+    C := Length(Czesci[P].Czesc)-1;
+    N := Length(Czesci[P].Czesc[C].Nuta)-1;
+    beat := Czesci[P].Czesc[C].Nuta[N].Start + Czesci[P].Czesc[C].Nuta[N].Dlugosc;
+    if (Music.Length < GetTimeFromBeat(beat)) then
+      error := true;
+  end;
+
+  if error then
+  begin
+    Log.LogError('Error: TXT is longer then the MP3 in Song: ' + AktSong.Path + AktSong.Filename);
+    SongError;
+    Exit;
+  end;
+
   if (ScreenSong.Mode = smMedley) or ScreenSong.PartyMedley then
   begin
     SetMedleyMode;
@@ -2510,7 +2529,7 @@ begin
     glColor4f(0.15, 0.30, 0.6, t);
 
     h := 100*t*ScreenH/RenderH;
-    SetFontStyle(1);
+    SetFontStyle(4);
     SetFontItalic(false);
     SetFontSize(h);
     CountDownText := IntToStr(round(timeDiff-t));
-- 
cgit v1.2.3