etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-16 01:35:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

really allow 8 effect columns

Browse source 
third time is the charm
This commit is contained in:
tildearrow 2022-01-19 17:34:20 -05:00
parent 6b2819019c
commit f39e522e7e
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/engine.h
View file

@ -11,7 +11,7 @@
#include <queue> #include <queue>
#define DIV_VERSION "0.4.5" #define DIV_VERSION "0.4.5"
#define DIV_ENGINE_VERSION 25 #define DIV_ENGINE_VERSION 26
enum DivStatusView { enum DivStatusView {
DIV_STATUS_NOTHING=0, DIV_STATUS_NOTHING=0,

2
src/engine/pattern.cpp
View file

@ -3,7 +3,7 @@
static DivPattern emptyPat; static DivPattern emptyPat;
DivPattern::DivPattern() { DivPattern::DivPattern() {
memset(data,-1,256*16*sizeof(short)); memset(data,-1,256*32*sizeof(short));
for (int i=0; i<256; i++) { for (int i=0; i<256; i++) {
data[i][0]=0; data[i][0]=0;
data[i][1]=0; data[i][1]=0;

2
src/engine/pattern.h
View file

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

4
src/gui/gui.cpp
View file

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