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

Merge branch 'master' into noLegacySample

Browse source
This commit is contained in:
tildearrow 2025-11-08 18:53:42 -05:00
commit aa8054754c
4 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/engine/instrument.cpp
View file

@ -886,7 +886,7 @@ size_t DivInstrument::writeFeatureLS(SafeWriter* w, std::vector<int>& list, cons
if (list.empty()) return 0;
FEATURE_BEGIN("SL");
FEATURE_BEGIN("LS");
w->writeS(list.size());
@ -935,7 +935,7 @@ size_t DivInstrument::writeFeatureLW(SafeWriter* w, std::vector<int>& list, cons
if (list.empty()) return 0;
FEATURE_BEGIN("WL");
FEATURE_BEGIN("LW");
w->writeS(list.size());
@ -2832,7 +2832,7 @@ DivDataErrors DivInstrument::readInsDataNew(SafeReader& reader, short version, b
} else if (memcmp(featCode,"S3",2)==0) { // SID3
readFeatureS3(reader,version);
} else {
if (song==NULL && (memcmp(featCode,"SL",2)==0 || (memcmp(featCode,"WL",2)==0))) {
if (song==NULL && (memcmp(featCode,"SL",2)==0 || (memcmp(featCode,"WL",2)==0) || (memcmp(featCode,"LS",2)==0) || (memcmp(featCode,"LW",2)==0))) {
// nothing
} else {
logW("unknown feature code %c%c!",featCode[0],featCode[1]);

1
src/engine/platform/sms.cpp
View file

@ -142,6 +142,7 @@ void DivPlatformSMS::acquire_mame(blip_buffer_t** bb, size_t len) {
// wahahaha heuristic...
int advance=len-h;
for (int i=0; i<4; i++) {
if (sn->m_volume[i]==0) continue;
if (sn->m_count[i]<advance) advance=sn->m_count[i];
}
if (advance<1) advance=1;

14
src/gui/newFilePicker.cpp
View file

@ -1757,6 +1757,20 @@ bool FurnaceFilePicker::draw(ImGuiWindowFlags winFlags) {
}
}
}
} else {
if (dirSelect) {
finalSelection.push_back(path);
curStatus=FP_STATUS_ACCEPTED;
if (noClose) {
for (FileEntry* j: chosenEntries) {
j->isSelected=false;
}
chosenEntries.clear();
updateEntryName();
} else {
isOpen=false;
}
}
}
}
}

9
src/gui/regView.cpp
View file

@ -39,7 +39,14 @@ void FurnaceGUI::drawRegView() {
} else {
ImGui::PushFont(patFont);
if (ImGui::BeginTable("Memory",17)) {
ImGui::TableSetupColumn("addr",ImGuiTableColumnFlags_WidthFixed);
float widthOne=ImGui::CalcTextSize("0").x;
if (size>0xfff) { // no im got gonna put some clamped log formula instead
ImGui::TableSetupColumn("addr",ImGuiTableColumnFlags_WidthFixed, widthOne*4.0f);
} else if (size>0xff) {
ImGui::TableSetupColumn("addr",ImGuiTableColumnFlags_WidthFixed, widthOne*3.0f);
} else {
ImGui::TableSetupColumn("addr",ImGuiTableColumnFlags_WidthFixed, widthOne*2.0f);
}
ImGui::TableNextRow();
ImGui::TableNextColumn();