otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

some rearranging, undo table column bump and

Browse source 
default to true for older verions
This commit is contained in:
Eknous-P 2023-11-16 14:13:45 +04:00
parent 225cdead96
commit 16425817f6
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/fileOps.cpp
View file

@ -2184,6 +2184,7 @@ bool DivEngine::loadFur(unsigned char* file, size_t len) {
for (int i=0; i<tchans; i++) { for (int i=0; i<tchans; i++) {
if (ds.version<189) { if (ds.version<189) {
subSong->chanShow[i]=reader.readC(); subSong->chanShow[i]=reader.readC();
subSong->chanShowChanOsc[i]=true;
} else { // stores 2 bools in a single char for better compat? } else { // stores 2 bools in a single char for better compat?
unsigned char tempchar=reader.readC(); unsigned char tempchar=reader.readC();
subSong->chanShow[i]=tempchar&0xf; subSong->chanShow[i]=tempchar&0xf;
@ -2588,6 +2589,7 @@ bool DivEngine::loadFur(unsigned char* file, size_t len) {
for (int i=0; i<tchans; i++) { for (int i=0; i<tchans; i++) {
if (ds.version<189) { if (ds.version<189) {
subSong->chanShow[i]=reader.readC(); subSong->chanShow[i]=reader.readC();
subSong->chanShowChanOsc[i]=true;
} else { } else {
unsigned char tempchar=reader.readC(); unsigned char tempchar=reader.readC();
subSong->chanShow[i]=tempchar&0xf; subSong->chanShow[i]=tempchar&0xf;

2
src/engine/song.h
View file

@ -184,8 +184,8 @@ struct DivSubSong {
patLen(64), patLen(64),
ordersLen(1) { ordersLen(1) {
for (int i=0; i<DIV_MAX_CHANS; i++) { for (int i=0; i<DIV_MAX_CHANS; i++) {
chanShowChanOsc[i]=true;
chanShow[i]=true; chanShow[i]=true;
chanShowChanOsc[i]=true;
chanCollapse[i]=0; chanCollapse[i]=0;
} }
} }

2
src/gui/channels.cpp
View file

@ -38,7 +38,7 @@ void FurnaceGUI::drawChannels() {
//ImGui::SetNextWindowSizeConstraints(ImVec2(440.0f*dpiScale,400.0f*dpiScale),ImVec2(canvasW,canvasH)); //ImGui::SetNextWindowSizeConstraints(ImVec2(440.0f*dpiScale,400.0f*dpiScale),ImVec2(canvasW,canvasH));
} }
if (ImGui::Begin("Channels",&channelsOpen,globalWinFlags)) { if (ImGui::Begin("Channels",&channelsOpen,globalWinFlags)) {
if (ImGui::BeginTable("ChannelList",4)) { if (ImGui::BeginTable("ChannelList",3)) {
ImGui::TableSetupColumn("c1",ImGuiTableColumnFlags_WidthFixed,0.0); ImGui::TableSetupColumn("c1",ImGuiTableColumnFlags_WidthFixed,0.0);
ImGui::TableSetupColumn("c2",ImGuiTableColumnFlags_WidthStretch,0.0); ImGui::TableSetupColumn("c2",ImGuiTableColumnFlags_WidthStretch,0.0);
ImGui::TableSetupColumn("c3",ImGuiTableColumnFlags_WidthFixed,48.0f*dpiScale); ImGui::TableSetupColumn("c3",ImGuiTableColumnFlags_WidthFixed,48.0f*dpiScale);