fix 0300 not being taken into account in pre note
This commit is contained in:
parent
20a5d9c089
commit
fe5587e958
|
@ -1266,11 +1266,11 @@ void DivEngine::nextRow() {
|
||||||
|
|
||||||
for (int j=0; j<curPat[i].effectCols; j++) {
|
for (int j=0; j<curPat[i].effectCols; j++) {
|
||||||
if (!song.preNoteNoEffect) {
|
if (!song.preNoteNoEffect) {
|
||||||
if (pat->data[curRow][4+(j<<1)]==0x03) {
|
if (pat->data[curRow][4+(j<<1)]==0x03 && pat->data[curRow][5+(j<<1)]!=0 && pat->data[curRow][5+(j<<1)]!=-1) {
|
||||||
doPreparePreNote=false;
|
doPreparePreNote=false;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (pat->data[curRow][4+(j<<1)]==0x06) {
|
if (pat->data[curRow][4+(j<<1)]==0x06 && pat->data[curRow][5+(j<<1)]!=0 && pat->data[curRow][5+(j<<1)]!=-1) {
|
||||||
doPreparePreNote=false;
|
doPreparePreNote=false;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -1297,11 +1297,11 @@ void DivEngine::nextRow() {
|
||||||
int addition=0;
|
int addition=0;
|
||||||
|
|
||||||
for (int j=0; j<curPat[i].effectCols; j++) {
|
for (int j=0; j<curPat[i].effectCols; j++) {
|
||||||
if (pat->data[curRow][4+(j<<1)]==0x03) {
|
if (pat->data[curRow][4+(j<<1)]==0x03 && pat->data[curRow][5+(j<<1)]!=0 && pat->data[curRow][5+(j<<1)]!=-1) {
|
||||||
doPrepareCut=false;
|
doPrepareCut=false;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (pat->data[curRow][4+(j<<1)]==0x06) {
|
if (pat->data[curRow][4+(j<<1)]==0x06 && pat->data[curRow][5+(j<<1)]!=0 && pat->data[curRow][5+(j<<1)]!=-1) {
|
||||||
doPrepareCut=false;
|
doPrepareCut=false;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue