IT import: note fade loading fixes
This commit is contained in:
parent
6ad49e88c3
commit
6f8f2b9e2a
|
@ -101,9 +101,7 @@ void readEnvelope(SafeReader& reader, DivInstrument* ins, int env) {
|
||||||
pointJustBegan=false;
|
pointJustBegan=false;
|
||||||
if (flags&2) { // loop
|
if (flags&2) { // loop
|
||||||
if (point==loopStart && (!(flags&4) || susStart==susEnd || loopStart>=susEnd)) {
|
if (point==loopStart && (!(flags&4) || susStart==susEnd || loopStart>=susEnd)) {
|
||||||
if (loopStart==loopEnd) {
|
if (loopStart!=loopEnd) {
|
||||||
target->rel=i;
|
|
||||||
} else {
|
|
||||||
target->loop=i;
|
target->loop=i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -493,7 +491,7 @@ bool DivEngine::loadIT(unsigned char* file, size_t len) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// add note fade if there isn't a release point in the volume envelope
|
// add note fade if there isn't a release point in the volume envelope
|
||||||
if (ins->std.volMacro.len>0) {
|
if (ins->std.volMacro.len>0 && ins->std.volMacro.rel>=ins->std.volMacro.len) {
|
||||||
ins->std.volMacro.len--;
|
ins->std.volMacro.len--;
|
||||||
int initial=ins->std.volMacro.val[ins->std.volMacro.len];
|
int initial=ins->std.volMacro.val[ins->std.volMacro.len];
|
||||||
ins->std.volMacro.rel=ins->std.volMacro.len;
|
ins->std.volMacro.rel=ins->std.volMacro.len;
|
||||||
|
|
Loading…
Reference in a new issue