really allow 8 effect columns

third time is the charm
tildearrow · Jan 19, 2022 · f39e522 · f39e522
1 parent 6b28190
commit f39e522
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/engine/engine.h b/src/engine/engine.h
@@ -11,7 +11,7 @@
 #include <queue>
 
 #define DIV_VERSION "0.4.5"
-#define DIV_ENGINE_VERSION 25
+#define DIV_ENGINE_VERSION 26
 
 enum DivStatusView {
   DIV_STATUS_NOTHING=0,

diff --git a/src/engine/pattern.cpp b/src/engine/pattern.cpp
@@ -3,7 +3,7 @@
 static DivPattern emptyPat;
 
 DivPattern::DivPattern() {
-  memset(data,-1,256*16*sizeof(short));
+  memset(data,-1,256*32*sizeof(short));
   for (int i=0; i<256; i++) {
     data[i][0]=0;
     data[i][1]=0;

diff --git a/src/engine/pattern.h b/src/engine/pattern.h
@@ -1,7 +1,7 @@
 #include "safeReader.h"
 
 struct DivPattern {
-  short data[256][16];
+  short data[256][32];
   SafeReader* compile(int len=256, int fxRows=1);
   DivPattern();
 };

diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
@@ -1486,7 +1486,7 @@ void FurnaceGUI::drawPattern() {
           }
           ImGui::EndDisabled();
           ImGui::SameLine();
-          ImGui::BeginDisabled(e->song.pat[i].effectRows>=4);
+          ImGui::BeginDisabled(e->song.pat[i].effectRows>=8);
           snprintf(chanID,256,">##_RCH%d",i);
           if (ImGui::SmallButton(chanID)) {
             e->song.pat[i].effectRows++;
@@ -2217,7 +2217,7 @@ void FurnaceGUI::makeUndo(ActionType action) {
       for (int i=0; i<e->getTotalChannelCount(); i++) {
         DivPattern* p=e->song.pat[i].getPattern(e->song.orders.ord[i][order],false);
         for (int j=0; j<e->song.patLen; j++) {
-          for (int k=0; k<16; k++) {
+          for (int k=0; k<32; k++) {
             if (p->data[j][k]!=oldPat[i]->data[j][k]) {
               s.pat.push_back(UndoPatternData(i,e->song.orders.ord[i][order],j,k,oldPat[i]->data[j][k],p->data[j][k]));
             }