Merge branch 'master' into ymf278b

This commit is contained in:
tildearrow 2024-07-13 17:39:43 -05:00
commit da1225c933
12 changed files with 1899 additions and 1497 deletions

View file

@ -1501,6 +1501,12 @@ void DivInstrument::readFeatureMA(SafeReader& reader, short version) {
unsigned short macroHeaderLen=reader.readS();
if (macroHeaderLen==0) {
logW("invalid macro header length!");
READ_FEAT_END;
return;
}
DivInstrumentMacro* target=&std.volMacro;
while (reader.tell()<endOfFeat) {
@ -1727,6 +1733,12 @@ void DivInstrument::readFeatureOx(SafeReader& reader, int op, short version) {
unsigned short macroHeaderLen=reader.readS();
if (macroHeaderLen==0) {
logW("invalid macro header length!");
READ_FEAT_END;
return;
}
DivInstrumentMacro* target=&std.opMacros[op].amMacro;
while (reader.tell()<endOfFeat) {