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

dev117 - save the flag

Browse source 
also serves as marker version for this huge change
This commit is contained in:
tildearrow 2022-09-23 13:36:23 -05:00
parent b9a4b568b6
commit 5e2cefff94
3 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/engine/engine.h
View file

@ -46,8 +46,8 @@
#define BUSY_BEGIN_SOFT softLocked=true; isBusy.lock(); #define BUSY_BEGIN_SOFT softLocked=true; isBusy.lock();
#define BUSY_END isBusy.unlock(); softLocked=false; #define BUSY_END isBusy.unlock(); softLocked=false;
#define DIV_VERSION "0.6pre1.5" #define DIV_VERSION "dev117"
#define DIV_ENGINE_VERSION 116 #define DIV_ENGINE_VERSION 117
// for imports // for imports
#define DIV_VERSION_MOD 0xff01 #define DIV_VERSION_MOD 0xff01
#define DIV_VERSION_FC 0xff02 #define DIV_VERSION_FC 0xff02

12
src/engine/fileOps.cpp
View file

@ -1101,7 +1101,9 @@ bool DivEngine::loadFur(unsigned char* file, size_t len) {
if (ds.version<115) { if (ds.version<115) {
ds.autoSystem=false; ds.autoSystem=false;
} }
if (ds.version<117) {
ds.ignorePCEDACVolume=true; ds.ignorePCEDACVolume=true;
}
ds.isDMF=false; ds.isDMF=false;
reader.readS(); // reserved reader.readS(); // reserved
@ -1534,7 +1536,12 @@ bool DivEngine::loadFur(unsigned char* file, size_t len) {
} else { } else {
reader.readC(); reader.readC();
} }
for (int i=0; i<3; i++) { if (ds.version>=117) {
ds.ignorePCEDACVolume=reader.readC();
} else {
reader.readC();
}
for (int i=0; i<2; i++) {
reader.readC(); reader.readC();
} }
} }
@ -3779,7 +3786,8 @@ SafeWriter* DivEngine::saveFur(bool notPrimary) {
w->writeC(song.delayBehavior); w->writeC(song.delayBehavior);
w->writeC(song.jumpTreatment); w->writeC(song.jumpTreatment);
w->writeC(song.autoSystem); w->writeC(song.autoSystem);
for (int i=0; i<3; i++) { w->writeC(song.ignorePCEDACVolume);
for (int i=0; i<2; i++) {
w->writeC(0); w->writeC(0);
} }

8
src/gui/compatFlags.cpp
View file

@ -143,10 +143,6 @@ void FurnaceGUI::drawCompatFlags() {
if (ImGui::IsItemHovered()) { if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("when enabled, any SN period under 8 will be written as 1 instead.\nthis replicates DefleMask behavior, but reduces available period range."); ImGui::SetTooltip("when enabled, any SN period under 8 will be written as 1 instead.\nthis replicates DefleMask behavior, but reduces available period range.");
} }
ImGui::Checkbox("Ignore PC Engine DAC Volume",&e->song.ignorePCEDACVolume);
if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("when enabled, PC Engine DAC Volume is ignored.");
}
ImGui::Text("Pitch linearity:"); ImGui::Text("Pitch linearity:");
if (ImGui::RadioButton("None",e->song.linearPitch==0)) { if (ImGui::RadioButton("None",e->song.linearPitch==0)) {
@ -285,6 +281,10 @@ void FurnaceGUI::drawCompatFlags() {
if (ImGui::IsItemHovered()) { if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("behavior changed in 0.6pre1.5"); ImGui::SetTooltip("behavior changed in 0.6pre1.5");
} }
ImGui::Checkbox("Ignore PC Engine DAC volume",&e->song.ignorePCEDACVolume);
if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("behavior changed in 0.6pre2");
}
} }
if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows)) curWindow=GUI_WINDOW_COMPAT_FLAGS; if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows)) curWindow=GUI_WINDOW_COMPAT_FLAGS;
ImGui::End(); ImGui::End();