otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix loading of pre-0.4 .dmf modules

Browse source
This commit is contained in:
tildearrow 2022-05-13 17:41:01 -05:00
parent 1ffbfe17d4
commit 106ebb52fa
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/engine/fileOps.cpp
View file

@ -654,7 +654,7 @@ bool DivEngine::loadDMF(unsigned char* file, size_t len) {
} }
for (int j=0; j<ds.ordersLen; j++) { for (int j=0; j<ds.ordersLen; j++) {
DivPattern* pat=chan.getPattern(ds.orders.ord[i][j],true); DivPattern* pat=chan.getPattern(ds.orders.ord[i][j],true);
if (ds.version>0x05) { // current pattern format if (ds.version>0x08) { // current pattern format
for (int k=0; k<ds.patLen; k++) { for (int k=0; k<ds.patLen; k++) {
// note // note
pat->data[k][0]=reader.readS(); pat->data[k][0]=reader.readS();
@ -741,11 +741,15 @@ bool DivEngine::loadDMF(unsigned char* file, size_t len) {
unsigned char vol=reader.readC(); unsigned char vol=reader.readC();
unsigned char fx=reader.readC(); unsigned char fx=reader.readC();
unsigned char fxVal=reader.readC(); unsigned char fxVal=reader.readC();
pat->data[k][3]=(vol==0x80)?-1:vol; pat->data[k][3]=(vol==0x80 || vol==0xff)?-1:vol;
// effect // effect
pat->data[k][4]=(fx==0x80)?-1:fx; pat->data[k][4]=(fx==0x80 || fx==0xff)?-1:fx;
pat->data[k][5]=(fxVal==0x80)?-1:fxVal; pat->data[k][5]=(fxVal==0x80 || fx==0xff)?-1:fxVal;
// instrument wasn't stored back then // instrument
if (ds.version>0x05) {
pat->data[k][2]=reader.readC();
if (pat->data[k][2]==0x80 || pat->data[k][2]==0xff) pat->data[k][2]=-1;
}
} }
} }
} }