diff options
| author | brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-02-28 21:09:28 +0000 |
|---|---|---|
| committer | brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-02-28 21:09:28 +0000 |
| commit | 4ec8eae5229e26b8ee648f5168d9b9c7f4e154eb (patch) | |
| tree | a167c7d6fd49f912deba57be86cf30b48f9dc622 /Game/Code/Classes/UFiles.pas | |
| parent | 4871039f6f1b55f867e2780013bd10ad16aeaa41 (diff) | |
| download | usdx-4ec8eae5229e26b8ee648f5168d9b9c7f4e154eb.tar.gz usdx-4ec8eae5229e26b8ee648f5168d9b9c7f4e154eb.tar.xz usdx-4ec8eae5229e26b8ee648f5168d9b9c7f4e154eb.zip | |
load song with "note length"-error anyway;
added option "LoadFaultySongs" (for song devs)
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2163 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
| -rw-r--r-- | Game/Code/Classes/UFiles.pas | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/Game/Code/Classes/UFiles.pas b/Game/Code/Classes/UFiles.pas index b3b6e3fd..6e552f40 100644 --- a/Game/Code/Classes/UFiles.pas +++ b/Game/Code/Classes/UFiles.pas @@ -663,7 +663,8 @@ begin if(numLines=0) then
begin
Log.LogError('Song ' + AktSong.Path + AktSong.Filename + ' has no lines?');
- Exit;
+ if (Ini.LoadFaultySongs=0) then
+ Exit;
end;
for line := 0 to numLines - 1 do
@@ -673,14 +674,16 @@ begin if(numNotes=0) then
begin
Log.LogError('Sentence ' + IntToStr(line+1) + ' in song ' + AktSong.Path + AktSong.Filename + ' has no notes?');
- Exit;
+ if (Ini.LoadFaultySongs=0) then
+ Exit;
end;
if(bt>Czesci[p].Czesc[line].Start) then
begin
Log.LogError('Beat error in sentence ' + IntToStr(line+1) + ', on beat ' + IntToStr(Czesci[p].Czesc[line].Start) +
' in song ' + AktSong.Path + AktSong.Filename);
- Exit;
+ if (Ini.LoadFaultySongs=0) then
+ Exit;
end;
bt := Czesci[p].Czesc[line].Start;
@@ -690,7 +693,8 @@ begin 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);
- Exit;
+ if (Ini.LoadFaultySongs=0) then
+ Exit;
end;
bt := Czesci[p].Czesc[line].Nuta[note].Start;
@@ -705,7 +709,7 @@ begin begin
Log.LogError('Note length error in sentence ' + IntToStr(line+1) + ', on beat ' + IntToStr(Czesci[p].Czesc[line].Nuta[note].Start) +
' in song ' + AktSong.Path + AktSong.Filename);
- Exit;
+ //Exit;
end;
if(medley) then
@@ -722,11 +726,13 @@ begin if(medley and not foundMedleyStart) then
begin
Log.LogError('Error MedleyStartBeat: no corresponding note start (beat) in song ' + AktSong.Path + AktSong.Filename);
- Exit;
+ if (Ini.LoadFaultySongs=0) then
+ Exit;
end else if(medley and not foundMedleyEnd) then
begin
Log.LogError('Error MedleyEndBeat: no corresponding note start+length in song ' + AktSong.Path + AktSong.Filename);
- Exit;
+ if (Ini.LoadFaultySongs=0) then
+ Exit;
end;
Result := true;
end;
|