fix 0300 not being taken into account in pre note

tildearrow · Oct 27, 2023 · fe5587e · fe5587e
1 parent 20a5d9c
commit fe5587e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/engine/playback.cpp b/src/engine/playback.cpp
@@ -1266,11 +1266,11 @@ void DivEngine::nextRow() {
 
               for (int j=0; j<curPat[i].effectCols; j++) {
                 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;
                     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;
                     break;
                   }
@@ -1297,11 +1297,11 @@ void DivEngine::nextRow() {
             int addition=0;
 
             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;
                 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;
                 break;
               }