Commit d6be23c

Nick committed on
Silencing some warnings and fixing Pointer/Integer bug
commit d6be23cf7e5077f820d289c6580b8d46122438f5 parent 9fd2dc0
4 changed files +15−15
ModifiedGBEmu.lpr +0−1
@@ -31,7 +31,6 @@ uses
31 Z80CPU in 'CPU\z80cpu.pas', 31 Z80CPU in 'CPU\z80cpu.pas',
32 sound in 'Sound\sound.pas', 32 sound in 'Sound\sound.pas',
33 vars in 'Global\vars.pas', 33 vars in 'Global\vars.pas',
34 mainloop in 'mainloop.pas',
35 options in 'options.pas', 34 options in 'options.pas',
36 about_hugetracker in 'about_hugetracker.pas'; 35 about_hugetracker in 'about_hugetracker.pas';
37 36
ModifiedGlobal/vars.pas +2−2
@@ -365,7 +365,7 @@ var
365 begin 365 begin
366 assignfile(cf, Name); 366 assignfile(cf, Name);
367 reset(cf, 1); 367 reset(cf, 1);
368 blockread(cf, m_rom, $180); 368 blockread(cf, {%H-}m_rom, $180);
369 closefile(cf); 369 closefile(cf);
370 buffer := ' '; 370 buffer := ' ';
371 for i := 0 to 15 do 371 for i := 0 to 15 do
@@ -608,7 +608,7 @@ begin
608 Result := False; 608 Result := False;
609 exit; 609 exit;
610 end; 610 end;
611 blockwrite(f, m_ram, fsize, numwritten); 611 blockwrite(f, m_ram, fsize, {%H-}numwritten);
612 closefile(f); 612 closefile(f);
613 Result := fsize = numwritten; 613 Result := fsize = numwritten;
614 end; 614 end;
Modifiedtracker.pas +9−8
@@ -950,6 +950,7 @@ end;
950 procedure TfrmTracker.FormCreate(Sender: TObject); 950 procedure TfrmTracker.FormCreate(Sender: TObject);
951 var 951 var
952 I: Integer; 952 I: Integer;
953 PUI: PtrUint;
953 begin 954 begin
954 {if Screen.Fonts.IndexOf('PixeliteTTF') = -1 then 955 {if Screen.Fonts.IndexOf('PixeliteTTF') = -1 then
955 MessageDlg('Warning', 'You don''t have the Pixelite font installed. '+ 956 MessageDlg('Warning', 'You don''t have the Pixelite font installed. '+
@@ -994,12 +995,12 @@ begin
994 RoutinesNode := Items[2]; 995 RoutinesNode := Items[2];
995 end; 996 end;
996 997
997 for I := 1 to 15 do 998 for PUI := 1 to 15 do
998 TreeView1.Items.AddChild(InstrumentsNode, IntToStr(I)+':').Data := Pointer(I); 999 TreeView1.Items.AddChild(InstrumentsNode, IntToStr(PUI)+':').Data := {%H-}Pointer(PUI);
999 1000
1000 for I := 0 to 15 do begin 1001 for PUI := 0 to 15 do begin
1001 TreeView1.Items.AddChild(WavesNode, 'Wave '+IntToStr(I)).Data := Pointer(I); 1002 TreeView1.Items.AddChild(WavesNode, 'Wave '+IntToStr(PUI)).Data := {%H-}Pointer(PUI);
1002 TreeView1.Items.AddChild(RoutinesNode, 'Routine '+IntToStr(I)).Data := Pointer(I); 1003 TreeView1.Items.AddChild(RoutinesNode, 'Routine '+IntToStr(PUI)).Data := {%H-}Pointer(PUI);
1003 end; 1004 end;
1004 1005
1005 // Initialize order table 1006 // Initialize order table
@@ -1708,17 +1709,17 @@ end;
1708 procedure TfrmTracker.TreeView1DblClick(Sender: TObject); 1709 procedure TfrmTracker.TreeView1DblClick(Sender: TObject);
1709 begin 1710 begin
1710 if TreeView1.Selected.Parent = InstrumentsNode then begin 1711 if TreeView1.Selected.Parent = InstrumentsNode then begin
1711 InstrumentNumberSpinner.Value := PtrUInt(TreeView1.Selected.Data); 1712 InstrumentNumberSpinner.Value := {%H-}PtrUInt(TreeView1.Selected.Data);
1712 PageControl1.ActivePage := InstrumentTabSheet; 1713 PageControl1.ActivePage := InstrumentTabSheet;
1713 end; 1714 end;
1714 1715
1715 if TreeView1.Selected.Parent = WavesNode then begin 1716 if TreeView1.Selected.Parent = WavesNode then begin
1716 WaveEditNumberSpinner.Value := PtrUInt(TreeView1.Selected.Data); 1717 WaveEditNumberSpinner.Value := {%H-}PtrUInt(TreeView1.Selected.Data);
1717 PageControl1.ActivePage := WavesTabSheet; 1718 PageControl1.ActivePage := WavesTabSheet;
1718 end; 1719 end;
1719 1720
1720 if TreeView1.Selected.Parent = RoutinesNode then begin 1721 if TreeView1.Selected.Parent = RoutinesNode then begin
1721 RoutineNumberSpinner.Value := PtrUInt(TreeView1.Selected.Data); 1722 RoutineNumberSpinner.Value := {%H-}PtrUInt(TreeView1.Selected.Data);
1722 PageControl1.ActivePage := RoutinesTabSheet; 1723 PageControl1.ActivePage := RoutinesTabSheet;
1723 end; 1724 end;
1724 end; 1725 end;
Modifiedtrackergrid.pas +4−4
@@ -745,12 +745,12 @@ begin
745 end; 745 end;
746 746
747 procedure TTrackerGrid.SetHighlightedRow(Row: Integer); 747 procedure TTrackerGrid.SetHighlightedRow(Row: Integer);
748 var 748 {var
749 R: TRect; 749 R: TRect;
750 OldRow: Integer; 750 OldRow: Integer;}
751 begin 751 begin
752 OldRow := FHighlightedRow; 752 //OldRow := FHighlightedRow;
753 FHighlightedRow := Row; 753 //FHighlightedRow := Row;
754 754
755 Invalidate 755 Invalidate
756 756