From f39e522e7efbfe5b271365b72d92f4f708dbee81 Mon Sep 17 00:00:00 2001 From: tildearrow Date: Wed, 19 Jan 2022 17:34:20 -0500 Subject: [PATCH] really allow 8 effect columns third time is the charm --- src/engine/engine.h | 2 +- src/engine/pattern.cpp | 2 +- src/engine/pattern.h | 2 +- src/gui/gui.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/engine/engine.h b/src/engine/engine.h index e4e1bdce..c6edeb16 100644 --- a/src/engine/engine.h +++ b/src/engine/engine.h @@ -11,7 +11,7 @@ #include #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 index 9ef90756..1242a458 100644 --- 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 index b80c55d9..9fb9df38 100644 --- 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 index 8c059cd3..15aa86be 100644 --- 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; igetTotalChannelCount(); i++) { DivPattern* p=e->song.pat[i].getPattern(e->song.orders.ord[i][order],false); for (int j=0; jsong.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])); }