From: <sv...@op...> - 2024-05-06 20:02:24
|
Author: sagamusix Date: Mon May 6 22:02:12 2024 New Revision: 20716 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20716 Log: Merged revision(s) 20711 from trunk/OpenMPT: [Fix] Ultratracker: Support the highest three octaves (patch by cs127). ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/Load_ult.cpp Modified: branches/OpenMPT-1.31/soundlib/Load_ult.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Load_ult.cpp Mon May 6 22:01:37 2024 (r20715) +++ branches/OpenMPT-1.31/soundlib/Load_ult.cpp Mon May 6 22:02:12 2024 (r20716) @@ -63,7 +63,7 @@ mptSmp.nSustainEnd = std::min(static_cast<SmpLength>(loopEnd), mptSmp.nLength); mptSmp.nVolume = volume; - mptSmp.nC5Speed = speed; + mptSmp.nC5Speed = speed * 2; // Doubled to fit the note range if(finetune) { mptSmp.Transpose(finetune / (12.0 * 32768.0)); @@ -207,7 +207,7 @@ b = file.ReadUint8(); } - m.note = (b > 0 && b < 61) ? (b + 35 + NOTE_MIN) : NOTE_NONE; + m.note = (b > 0 && b < 97) ? (b + 23 + NOTE_MIN) : NOTE_NONE; const auto [instr, cmd, para1, para2] = file.ReadArray<uint8, 4>(); |