From 1a29ac622f4295b6a20ee3c00c045724c18c538f Mon Sep 17 00:00:00 2001 From: Johannes Schultz Date: Thu, 26 Sep 2024 13:44:56 +0000 Subject: [PATCH] [Fix] Fix mis-merge in r21758. git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.30@21761 56274372-70c3-4bfc-bfc3-4c3a0b034d27 --- soundlib/Load_okt.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/soundlib/Load_okt.cpp b/soundlib/Load_okt.cpp index ca4a765faa2..91e1cc728be 100644 --- a/soundlib/Load_okt.cpp +++ b/soundlib/Load_okt.cpp @@ -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))