Commit f0b0b8e

Nick Faro committed on
Boolean simplification
commit f0b0b8ecb8faa92a3fc1583ea4c9a618e8911aff parent 5468cab
1 changed files +4−4
Modifiedtrackergrid.pas +4−4
@@ -518,19 +518,19 @@ procedure TTrackerGrid.PerformPaste(Paste: TSelection; Where: TSelectionPos; Mix
518 procedure OverlayCell(var Cell1: TCell; const Cell2: TSelectedCell); 518 procedure OverlayCell(var Cell1: TCell; const Cell2: TSelectedCell);
519 begin 519 begin
520 if cpNote in Cell2.Parts then 520 if cpNote in Cell2.Parts then
521 if (not Mix) or (Mix and (Cell2.Cell.Note <> NO_NOTE)) then 521 if (not Mix) or (Cell2.Cell.Note <> NO_NOTE) then
522 Cell1.Note := Cell2.Cell.Note; 522 Cell1.Note := Cell2.Cell.Note;
523 523
524 if cpInstrument in Cell2.Parts then 524 if cpInstrument in Cell2.Parts then
525 if (not Mix) or (Mix and (Cell2.Cell.Instrument <> 0)) then 525 if (not Mix) or (Cell2.Cell.Instrument <> 0) then
526 Cell1.Instrument := Cell2.Cell.Instrument; 526 Cell1.Instrument := Cell2.Cell.Instrument;
527 527
528 if cpEffectCode in Cell2.Parts then 528 if cpEffectCode in Cell2.Parts then
529 if (not Mix) or (Mix and (Cell2.Cell.EffectCode <> 0)) then 529 if (not Mix) or (Cell2.Cell.EffectCode <> 0) then
530 Cell1.EffectCode := Cell2.Cell.EffectCode; 530 Cell1.EffectCode := Cell2.Cell.EffectCode;
531 531
532 if cpEffectParams in Cell2.Parts then 532 if cpEffectParams in Cell2.Parts then
533 if (not Mix) or (Mix and (Cell2.Cell.EffectParams.Value <> 0)) then 533 if (not Mix) or (Cell2.Cell.EffectParams.Value <> 0) then
534 Cell1.EffectParams.Value := Cell2.Cell.EffectParams.Value; 534 Cell1.EffectParams.Value := Cell2.Cell.EffectParams.Value;
535 end; 535 end;
536 var 536 var