Commit 62a7b29

Nick Faro committed on
some fixes
commit 62a7b29f7143e8b1a0ff23ed9f7c98bdd7aec663 parent 1b280d7
6 changed files +43−7
Modifiedsrc/codegen.pas +1−1
@@ -581,7 +581,7 @@ begin
581 +IntToStr(Song.TicksPerRow[1])+', ' 581 +IntToStr(Song.TicksPerRow[1])+', '
582 +IntToStr(Song.TicksPerRow[2])+', ' 582 +IntToStr(Song.TicksPerRow[2])+', '
583 +IntToStr(Song.TicksPerRow[3])); 583 +IntToStr(Song.TicksPerRow[3]));
584 OutSL.Add('db '+IntToStr(OrderCount(Song)*2)); 584 OutSL.Add('dw '+IntToStr(OrderCount(Song)*2));
585 OutSL.Add('dw order1, order2, order3, order4'); 585 OutSL.Add('dw order1, order2, order3, order4');
586 OutSL.Add('dw duty_instruments, wave_instruments, noise_instruments'); 586 OutSL.Add('dw duty_instruments, wave_instruments, noise_instruments');
587 OutSL.Add('dw routines'); 587 OutSL.Add('dw routines');
Modifiedsrc/hUGEDriver +1−1
@@ -1 +1 @@
1 Subproject commit e22002012488c93beb5538e0b59df52e4bbc25f5 1 Subproject commit a28135f22e12b7aa7400f50ce0f47e8f94b7af41
Modifiedsrc/hUGETracker.lpi +8−1
@@ -184,9 +184,16 @@
184 <OpenInFileMan Value="True"/> 184 <OpenInFileMan Value="True"/>
185 </PublishOptions> 185 </PublishOptions>
186 <RunParams> 186 <RunParams>
187 <local>
188 <LaunchingApplication Use="True"/>
189 </local>
187 <FormatVersion Value="2"/> 190 <FormatVersion Value="2"/>
188 <Modes Count="1"> 191 <Modes Count="1">
189 <Mode0 Name="default"/> 192 <Mode0 Name="default">
193 <local>
194 <LaunchingApplication Use="True"/>
195 </local>
196 </Mode0>
190 </Modes> 197 </Modes>
191 </RunParams> 198 </RunParams>
192 <RequiredPackages Count="5"> 199 <RequiredPackages Count="5">
Modifiedsrc/machine.pas +2−0
@@ -465,6 +465,8 @@ begin
465 if WritingVGM then 465 if WritingVGM then
466 VGMWriteReg(Address, Data); 466 VGMWriteReg(Address, Data);
467 467
468 //writeln('WRITING ', hexstr(Address,4), ' ', hexstr(data,2));
469
468 sndRegChange := True; 470 sndRegChange := True;
469 if address = $ff26 then 471 if address = $ff26 then
470 begin 472 begin
Modifiedsrc/tracker.lfm +6−2
@@ -62,10 +62,10 @@ object frmTracker: TfrmTracker
62 Height = 684 62 Height = 684
63 Top = 0 63 Top = 0
64 Width = 1218 64 Width = 1218
65 ActivePage = InstrumentTabSheet 65 ActivePage = PatternTabSheet
66 Align = alClient 66 Align = alClient
67 ParentFont = False 67 ParentFont = False
68 TabIndex = 2 68 TabIndex = 1
69 TabOrder = 0 69 TabOrder = 0
70 object GeneralTabSheet: TTabSheet 70 object GeneralTabSheet: TTabSheet
71 Caption = 'General' 71 Caption = 'General'
@@ -2252,6 +2252,10 @@ object frmTracker: TfrmTracker
2252 object DebugButton: TMenuItem 2252 object DebugButton: TMenuItem
2253 Caption = 'Debug button' 2253 Caption = 'Debug button'
2254 OnClick = DebugButtonClick 2254 OnClick = DebugButtonClick
2255 object MenuItem59: TMenuItem
2256 Caption = 'MenuItem59'
2257 OnClick = MenuItem59Click
2258 end
2255 end 2259 end
2256 end 2260 end
2257 object MenuBarActionList: TActionList 2261 object MenuBarActionList: TActionList
Modifiedsrc/tracker.pas +25−2
@@ -46,6 +46,7 @@ type
46 InstrumentPopupMenu: TPopupMenu; 46 InstrumentPopupMenu: TPopupMenu;
47 MenuItem57: TMenuItem; 47 MenuItem57: TMenuItem;
48 MenuItem58: TMenuItem; 48 MenuItem58: TMenuItem;
49 MenuItem59: TMenuItem;
49 SingleStepAction: TAction; 50 SingleStepAction: TAction;
50 FileSave1: TAction; 51 FileSave1: TAction;
51 MenuItem26: TMenuItem; 52 MenuItem26: TMenuItem;
@@ -317,6 +318,7 @@ type
317 procedure MenuItem56Click(Sender: TObject); 318 procedure MenuItem56Click(Sender: TObject);
318 procedure MenuItem57Click(Sender: TObject); 319 procedure MenuItem57Click(Sender: TObject);
319 procedure MenuItem58Click(Sender: TObject); 320 procedure MenuItem58Click(Sender: TObject);
321 procedure MenuItem59Click(Sender: TObject);
320 procedure OrderEditStringGridEditingDone(Sender: TObject); 322 procedure OrderEditStringGridEditingDone(Sender: TObject);
321 procedure OrderEditStringGridMouseDown(Sender: TObject; 323 procedure OrderEditStringGridMouseDown(Sender: TObject;
322 Button: TMouseButton; Shift: TShiftState; X, Y: Integer); 324 Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
@@ -2275,6 +2277,22 @@ begin
2275 end; 2277 end;
2276 end; 2278 end;
2277 2279
2280 procedure TfrmTracker.MenuItem59Click(Sender: TObject);
2281 var
2282 I: Integer;
2283 T: Integer;
2284 begin
2285 for I := Low(Song.OrderMatrix[0]) to High(Song.OrderMatrix[0]) do begin
2286 writeln('swappin', I);
2287 T :=Song.OrderMatrix[0][I];
2288 Song.OrderMatrix[0][I] := Song.OrderMatrix[1][I];
2289
2290 Song.OrderMatrix[1][I] := T;
2291 end;
2292 CopyOrderMatrixToOrderGrid;
2293 ReloadPatterns;
2294 end;
2295
2278 procedure TfrmTracker.OrderEditStringGridEditingDone(Sender: TObject); 2296 procedure TfrmTracker.OrderEditStringGridEditingDone(Sender: TObject);
2279 begin 2297 begin
2280 if OrderEditStringGrid.Row > -1 then 2298 if OrderEditStringGrid.Row > -1 then
@@ -2366,9 +2384,14 @@ end;
2366 2384
2367 procedure TfrmTracker.DebugButtonClick(Sender: TObject); 2385 procedure TfrmTracker.DebugButtonClick(Sender: TObject);
2368 var 2386 var
2369 Stream: TFileStream; 2387 I: Integer;
2370 begin 2388 begin
2371 // debug 2389 for I := Low(Song.OrderMatrix[0]) to High(Song.OrderMatrix[1]) do begin
2390 Song.OrderMatrix[0][I] := Song.OrderMatrix[0][I] xor Song.OrderMatrix[1][I];
2391 Song.OrderMatrix[1][I] := Song.OrderMatrix[0][I] xor Song.OrderMatrix[1][I];
2392 Song.OrderMatrix[0][I] := Song.OrderMatrix[0][I] xor Song.OrderMatrix[1][I];
2393 end;
2394 ReloadPatterns;
2372 end; 2395 end;
2373 2396
2374 procedure TfrmTracker.DecreaseOctaveActionExecute(Sender: TObject); 2397 procedure TfrmTracker.DecreaseOctaveActionExecute(Sender: TObject);