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

improve ins type detection

Browse source
This commit is contained in:
tildearrow 2024-12-06 18:47:09 -05:00
parent 192be95c14
commit 8263a320c3
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/engine/fileOps/dmf.cpp
View file

@ -23,6 +23,7 @@
// - 27: v1.1.7 // - 27: v1.1.7
// - current format version // - current format version
// - adds sample start/end points // - adds sample start/end points
// - 1.2 introduces MSX2 (AY+SCC)
// - 26: v1.1.3 // - 26: v1.1.3
// - changes height of FDS wave to 6-bit (it was 4-bit before) // - changes height of FDS wave to 6-bit (it was 4-bit before)
// - 25: v1.1 // - 25: v1.1
@ -414,7 +415,7 @@ bool DivEngine::loadDMF(unsigned char* file, size_t len) {
ins->type=DIV_INS_OPM; ins->type=DIV_INS_OPM;
} }
if (ds.system[0]==DIV_SYSTEM_MSX2) { if (ds.system[0]==DIV_SYSTEM_MSX2) {
ins->type=DIV_INS_SCC; ins->type=DIV_INS_AY;
} }
if ((ds.system[0]==DIV_SYSTEM_NES || ds.system[0]==DIV_SYSTEM_NES_VRC7 || ds.system[0]==DIV_SYSTEM_NES_FDS) && ins->type==DIV_INS_STD) { if ((ds.system[0]==DIV_SYSTEM_NES || ds.system[0]==DIV_SYSTEM_NES_VRC7 || ds.system[0]==DIV_SYSTEM_NES_FDS) && ins->type==DIV_INS_STD) {
ins->type=DIV_INS_NES; ins->type=DIV_INS_NES;
@ -846,6 +847,13 @@ bool DivEngine::loadDMF(unsigned char* file, size_t len) {
} }
} }
} }
if (ds.system[0]==DIV_SYSTEM_MSX2) {
if (i>=3 && pat->data[k][2]!=-1) {
if (pat->data[k][2]>=0 && pat->data[k][2]<ds.insLen) {
ds.ins[pat->data[k][2]]->type=DIV_INS_SCC;
}
}
}
} }
} else { // historic pattern format } else { // historic pattern format
if (i<16) pat->data[0][2]=historicColIns[i]; if (i<16) pat->data[0][2]=historicColIns[i];