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

chip flags rewrite, part 2

Browse source 
move systemFlags to legacy status
This commit is contained in:
tildearrow 2022-09-29 03:29:24 -05:00
parent 82eed26094
commit 0acca7458d
9 changed files with 40 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/gui/gui.cpp
View file

@ -3438,7 +3438,7 @@ bool FurnaceGUI::loop() {
if (ImGui::BeginMenu("configure chip...")) {
for (int i=0; i<e->song.systemLen; i++) {
if (ImGui::TreeNode(fmt::sprintf("%d. %s##_SYSP%d",i+1,getSystemName(e->song.system[i]),i).c_str())) {
drawSysConf(i,e->song.system[i],e->song.systemFlags[i],true);
drawSysConf(i,e->song.system[i],e->song.systemFlagsOld[i],true);
ImGui::TreePop();
}
}

2
src/gui/insEdit.cpp
View file

@ -1904,7 +1904,7 @@ void FurnaceGUI::drawInsEdit() {
if (e->song.system[i]==DIV_SYSTEM_VRC7) {
isPresent[3]=true;
} else if (e->song.system[i]==DIV_SYSTEM_OPLL || e->song.system[i]==DIV_SYSTEM_OPLL_DRUMS) {
isPresent[(e->song.systemFlags[i]>>4)&3]=true;
isPresent[(e->song.systemFlagsOld[i]>>4)&3]=true;
}
}
if (!isPresent[0] && !isPresent[1] && !isPresent[2] && !isPresent[3]) {

2
src/gui/settings.cpp
View file

@ -273,7 +273,7 @@ void FurnaceGUI::drawSettings() {
settings.initialSys.push_back(e->song.system[i]);
settings.initialSys.push_back(e->song.systemVol[i]);
settings.initialSys.push_back(e->song.systemPan[i]);
settings.initialSys.push_back(e->song.systemFlags[i]);
settings.initialSys.push_back(e->song.systemFlagsOld[i]);
}
settings.initialSysName=e->song.systemName;
}

2
src/gui/sysManager.cpp
View file

@ -70,7 +70,7 @@ void FurnaceGUI::drawSysManager() {
}
ImGui::TableNextColumn();
if (ImGui::TreeNode(fmt::sprintf("%d. %s##_SYSM%d",i+1,getSystemName(e->song.system[i]),i).c_str())) {
drawSysConf(i,e->song.system[i],e->song.systemFlags[i],true);
drawSysConf(i,e->song.system[i],e->song.systemFlagsOld[i],true);
ImGui::TreePop();
}
ImGui::TableNextColumn();