From 200dae8ffa02fd178445d72c7b5912d506c59cbf Mon Sep 17 00:00:00 2001 From: brunzelchen Date: Tue, 2 Mar 2010 18:32:09 +0000 Subject: SongCheck: list all errors; fixed plugin selection in challenge mode git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2166 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/Classes/UFiles.pas | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'Game/Code/Classes') diff --git a/Game/Code/Classes/UFiles.pas b/Game/Code/Classes/UFiles.pas index 6e552f40..35c8a850 100644 --- a/Game/Code/Classes/UFiles.pas +++ b/Game/Code/Classes/UFiles.pas @@ -645,7 +645,7 @@ var medley: boolean; begin - Result := false; + Result := true; bt := -32000; if(AktSong.Medley.Source = msTag) then @@ -664,7 +664,7 @@ begin begin Log.LogError('Song ' + AktSong.Path + AktSong.Filename + ' has no lines?'); if (Ini.LoadFaultySongs=0) then - Exit; + Result := false; end; for line := 0 to numLines - 1 do @@ -675,7 +675,7 @@ begin begin Log.LogError('Sentence ' + IntToStr(line+1) + ' in song ' + AktSong.Path + AktSong.Filename + ' has no notes?'); if (Ini.LoadFaultySongs=0) then - Exit; + Result := false; end; if(bt>Czesci[p].Czesc[line].Start) then @@ -683,7 +683,7 @@ begin Log.LogError('Beat error in sentence ' + IntToStr(line+1) + ', on beat ' + IntToStr(Czesci[p].Czesc[line].Start) + ' in song ' + AktSong.Path + AktSong.Filename); if (Ini.LoadFaultySongs=0) then - Exit; + Result := false; end; bt := Czesci[p].Czesc[line].Start; @@ -694,7 +694,7 @@ begin Log.LogError('Beat error in sentence ' + IntToStr(line+1) + ', on beat ' + IntToStr(Czesci[p].Czesc[line].Nuta[note].Start) + ' in song ' + AktSong.Path + AktSong.Filename); if (Ini.LoadFaultySongs=0) then - Exit; + Result := false; end; bt := Czesci[p].Czesc[line].Nuta[note].Start; @@ -727,14 +727,13 @@ begin begin Log.LogError('Error MedleyStartBeat: no corresponding note start (beat) in song ' + AktSong.Path + AktSong.Filename); if (Ini.LoadFaultySongs=0) then - Exit; + Result := false; end else if(medley and not foundMedleyEnd) then begin Log.LogError('Error MedleyEndBeat: no corresponding note start+length in song ' + AktSong.Path + AktSong.Filename); if (Ini.LoadFaultySongs=0) then - Exit; + Result := false; end; - Result := true; end; -- cgit v1.2.3