Commit 5d1f846

Nick Faro committed on
Don't enable subpattern if there was no noise macro
commit 5d1f846f5e96e2d37329a295b831feec4681529b parent 4da1d25
1 changed files +6−3
Modifiedsrc/song.pas +6−3
@@ -733,7 +733,7 @@ end;
733 function UpgradeSong(S: TSongV4): TSong; 733 function UpgradeSong(S: TSongV4): TSong;
734 var 734 var
735 SV6: TSongV6; 735 SV6: TSongV6;
736 I: Integer; 736 I, K: Integer;
737 737
738 function ConvertPattern(Pat: PPatternV1): PPattern; 738 function ConvertPattern(Pat: PPatternV1): PPattern;
739 var 739 var
@@ -786,10 +786,13 @@ begin
786 SV6.Instruments.All[I].SubpatternEnabled := False; 786 SV6.Instruments.All[I].SubpatternEnabled := False;
787 BlankPattern(@SV6.Instruments.All[I].Subpattern); 787 BlankPattern(@SV6.Instruments.All[I].Subpattern);
788 end; 788 end;
789 // TODO: Port over noise macro 789
790 for I := Low(S.Instruments.Noise) to High(S.Instruments.Noise) do begin 790 for I := Low(S.Instruments.Noise) to High(S.Instruments.Noise) do begin
791 SV6.Instruments.Noise[I].Subpattern := ConvertNoiseMacro(S.Instruments.Noise[I].NoiseMacro); 791 SV6.Instruments.Noise[I].Subpattern := ConvertNoiseMacro(S.Instruments.Noise[I].NoiseMacro);
792 SV6.Instruments.Noise[I].SubpatternEnabled := True; 792 for K := Low(TNoiseMacro) to High(TNoiseMacro) do begin
793 if S.Instruments.Noise[I].NoiseMacro[K] <> 0 then
794 SV6.Instruments.Noise[I].SubpatternEnabled := True;
795 end;
793 end; 796 end;
794 797
795 SV6.Waves := S.Waves; 798 SV6.Waves := S.Waves;