Commit 6db00a5

Nick Faro committed on
fixes
commit 6db00a590e0f7e65ff9b156b398d7e43a43037df parent 0fe3ce4
2 changed files +0−23
Modifiedsrc/codegen.pas +0−8
@@ -126,14 +126,6 @@ begin
126 itWave: Result := Instrument <= UsedStuff.HighestWaveInst; 126 itWave: Result := Instrument <= UsedStuff.HighestWaveInst;
127 itNoise: Result := Instrument <= UsedStuff.HighestNoiseInst; 127 itNoise: Result := Instrument <= UsedStuff.HighestNoiseInst;
128 end; 128 end;
129
130 function OrderCount(const Song: TSong): Integer;
131 var
132 OrderMatrix: TOrderMatrix;
133 begin
134 OrderMatrix := Song.OrderMatrix;
135 Result := MaxIntValue([High(OrderMatrix[0]), High(OrderMatrix[1]),
136 High(OrderMatrix[2]), High(OrderMatrix[3])]) * 2;
137 end; 129 end;
138 130
139 procedure RenderSongToGBDKC(Song: TSong; DescriptorName: String; Filename: string; Bank: Integer = -1); 131 procedure RenderSongToGBDKC(Song: TSong; DescriptorName: String; Filename: string; Bank: Integer = -1);
Modifiedsrc/song.pas +0−15
@@ -143,7 +143,6 @@ function UpgradeSong(S: TSongV4): TSong; overload;
143 function UpgradeSong(S: TSongV6): TSong; overload; 143 function UpgradeSong(S: TSongV6): TSong; overload;
144 144
145 function OptimizeSong(const S: TSong): TSong; 145 function OptimizeSong(const S: TSong): TSong;
146 function PatternIsUsed(Idx: Integer; const Song: TSong): Boolean;
147 function OrderCount(const Song: TSong): Integer; 146 function OrderCount(const Song: TSong): Integer;
148 147
149 implementation 148 implementation
@@ -943,19 +942,6 @@ begin
943 end; 942 end;
944 end; 943 end;
945 944
946 <<<<<<< HEAD
947 =======
948 function PatternIsUsed(Idx: Integer; const Song: TSong): Boolean;
949 var
950 I, J: Integer;
951 begin
952 for I := Low(Song.OrderMatrix) to High(Song.OrderMatrix) do
953 for J := Low(Song.OrderMatrix[I]) to High(Song.OrderMatrix[I])-1 do
954 if Song.OrderMatrix[I, J] = Idx then Exit(True);
955
956 Result := False;
957 end;
958
959 function OrderCount(const Song: TSong): Integer; 945 function OrderCount(const Song: TSong): Integer;
960 var 946 var
961 OrderMatrix: TOrderMatrix; 947 OrderMatrix: TOrderMatrix;
@@ -965,5 +951,4 @@ begin
965 High(OrderMatrix[2]), High(OrderMatrix[3])]); 951 High(OrderMatrix[2]), High(OrderMatrix[3])]);
966 end; 952 end;
967 953
968 >>>>>>> 71f550f (Fix reading order count from symbol table)
969 end. 954 end.