aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-05-23 13:17:45 +0000
committerbrunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-05-23 13:17:45 +0000
commit7d7011bd7b2eeac58d660f267abfc62df0dad8f6 (patch)
tree2d2066e7ab49a45f4aa7dba505bd4b202365cefe
parent091ea88f488b1689b9d312f6452ba6601a969e4e (diff)
downloadusdx-7d7011bd7b2eeac58d660f267abfc62df0dad8f6.tar.gz
usdx-7d7011bd7b2eeac58d660f267abfc62df0dad8f6.tar.xz
usdx-7d7011bd7b2eeac58d660f267abfc62df0dad8f6.zip
zero-length notes will no longer be ignored. they will be converted into freestyle notes.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2407 b956fd51-792f-4845-bead-9b4dfca2ff2c
-rw-r--r--src/base/USong.pas27
1 files changed, 15 insertions, 12 deletions
diff --git a/src/base/USong.pas b/src/base/USong.pas
index a441fe40..43251f8f 100644
--- a/src/base/USong.pas
+++ b/src/base/USong.pas
@@ -510,22 +510,25 @@ begin
//Check for ZeroNote
if Param2 = 0 then
+ begin
Log.LogWarn(Format('"%s" in line %d: %s',
- [FileNamePath.ToNative, FileLineNo, 'found note with length zero -> note ignored']), 'TSong.LoadSong')
+ [FileNamePath.ToNative, FileLineNo,
+ 'found note with length zero -> converted to FreeStyle']),
+ 'TSong.LoadSong');
//Log.LogError('Found zero-length note at "'+Param0+' '+IntToStr(Param1)+' '+IntToStr(Param2)+' '+IntToStr(Param3)+ParamLyric+'" -> Note ignored!')
+ Param0 := 'F';
+ end;
+
+ // add notes
+ if not Both then
+ // P1
+ ParseNote(0, Param0, (Param1+Rel[0]) * Mult, Param2 * Mult, Param3, ParamLyric)
else
begin
- // add notes
- if not Both then
- // P1
- ParseNote(0, Param0, (Param1+Rel[0]) * Mult, Param2 * Mult, Param3, ParamLyric)
- else
- begin
- // P1 + P2
- ParseNote(0, Param0, (Param1+Rel[0]) * Mult, Param2 * Mult, Param3, ParamLyric);
- ParseNote(1, Param0, (Param1+Rel[1]) * Mult, Param2 * Mult, Param3, ParamLyric);
- end;
- end; //Zeronote check
+ // P1 + P2
+ ParseNote(0, Param0, (Param1+Rel[0]) * Mult, Param2 * Mult, Param3, ParamLyric);
+ ParseNote(1, Param0, (Param1+Rel[1]) * Mult, Param2 * Mult, Param3, ParamLyric);
+ end;
end // if
else if Param0 = '-' then