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

XM import: fix infinite loop

Browse source
This commit is contained in:
tildearrow 2024-07-14 01:47:17 -05:00
parent 691336a9ce
commit 0efe8a1320
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/engine/fileOps/xm.cpp
View file

@ -525,21 +525,27 @@ bool DivEngine::loadXM(unsigned char* file, size_t len) {
if (volType&1) { if (volType&1) {
// add fade-out // add fade-out
int cur=64; if (volFade!=0) {
if (ins->std.volMacro.len>0) { int cur=64;
cur=ins->std.volMacro.val[ins->std.volMacro.len-1]; if (ins->std.volMacro.len>0) {
} cur=ins->std.volMacro.val[ins->std.volMacro.len-1];
for (int fadeOut=32767; fadeOut>0 && ins->std.volMacro.len<254; fadeOut-=volFade) { }
ins->std.volMacro.val[ins->std.volMacro.len++]=(cur*fadeOut)>>15; for (int fadeOut=32767; fadeOut>0 && ins->std.volMacro.len<254; fadeOut-=volFade) {
} ins->std.volMacro.val[ins->std.volMacro.len++]=(cur*fadeOut)>>15;
if (ins->std.volMacro.len<255) { }
ins->std.volMacro.val[ins->std.volMacro.len++]=0; if (ins->std.volMacro.len<255) {
ins->std.volMacro.val[ins->std.volMacro.len++]=0;
}
if (ins->std.volMacro.rel<ins->std.volMacro.len && ins->std.volMacro.rel<ins->std.volMacro.loop) {
ins->std.volMacro.loop=255;
}
} }
} else { } else {
// add a one-tick macro to make note release happy // add a one-tick macro to make note release happy
ins->std.volMacro.val[0]=64; ins->std.volMacro.val[0]=64;
ins->std.volMacro.val[1]=0; ins->std.volMacro.val[1]=0;
ins->std.volMacro.rel=0; ins->std.volMacro.rel=0;
ins->std.volMacro.loop=255;
ins->std.volMacro.len=2; ins->std.volMacro.len=2;
} }