Skip to content

Commit

Permalink
[Fix] Fix mis-merge in r21758.
Browse files Browse the repository at this point in the history
git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.30@21761 56274372-70c3-4bfc-bfc3-4c3a0b034d27
  • Loading branch information
sagamusix committed Sep 26, 2024
1 parent 9a9655b commit 1a29ac6
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions soundlib/Load_okt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,10 @@ static void ReadOKTPattern(FileReader &chunk, PATTERNINDEX pat, CSoundFile &sndF
auto &sample = sndFile.GetSample(m.instr);
// Default volume only works on raw Paula channels
if(pairedChn[chn] && sample.nVolume < 256)
{
m.volcmd = VOLCMD_VOLUME;
m.vol = 64;
}

// If channel and sample type don't match, stop this channel (add 100 to the instrument number to make it understandable what happened during import)
if((sample.cues[0] == 1 && pairedChn[chn] != 0) || (sample.cues[0] == 0 && pairedChn[chn] == 0))
Expand Down

0 comments on commit 1a29ac6

Please sign in to comment.