diff options
| author | brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-03-06 17:11:31 +0000 |
|---|---|---|
| committer | brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-03-06 17:11:31 +0000 |
| commit | 4aa6a474ad3f38bdaccfd76b899e2b9142bea95b (patch) | |
| tree | 8de55b623deb0b956bdf989e1338a0984e8cd5a7 /Game/Code/Classes/UFiles.pas | |
| parent | 715b115da3d84b8a487c882765c0d1af4e309d45 (diff) | |
| download | usdx-4aa6a474ad3f38bdaccfd76b899e2b9142bea95b.tar.gz usdx-4aa6a474ad3f38bdaccfd76b899e2b9142bea95b.tar.xz usdx-4aa6a474ad3f38bdaccfd76b899e2b9142bea95b.zip | |
allow FreeStyle notes with zero length
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2178 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game/Code/Classes/UFiles.pas')
| -rw-r--r-- | Game/Code/Classes/UFiles.pas | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Game/Code/Classes/UFiles.pas b/Game/Code/Classes/UFiles.pas index c2ec467f..854ed9b0 100644 --- a/Game/Code/Classes/UFiles.pas +++ b/Game/Code/Classes/UFiles.pas @@ -699,9 +699,17 @@ begin end;
bt := Czesci[p].Czesc[line].Nuta[note].Start;
- if (Czesci[p].Czesc[line].Nuta[note].Dlugosc<1) then
+ if (Czesci[p].Czesc[line].Nuta[note].Dlugosc<0) then
begin
- Log.LogError('Note length <1 in sentence ' + IntToStr(line+1) + ', on beat ' + IntToStr(Czesci[p].Czesc[line].Nuta[note].Start) +
+ Log.LogError('Note length <0 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
+ Result := false;
+ end;
+
+ if (Czesci[p].Czesc[line].Nuta[note].Dlugosc=0) and not Czesci[p].Czesc[line].Nuta[note].FreeStyle then
+ begin
+ Log.LogError('Note length =0 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
Result := false;
|