etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-18 02:25:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix format breaking

Browse source
This commit is contained in:
cam900 2022-04-10 18:45:55 +09:00
parent 075ec9b6de
commit 78b88d61ce
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/engine/instrument.cpp
View file

@ -70,7 +70,6 @@ void DivInstrument::putInsData(SafeWriter* w) {
for (int j=0; j<4; j++) { for (int j=0; j<4; j++) {
DivInstrumentFM::Operator& op=fm.op[j]; DivInstrumentFM::Operator& op=fm.op[j];
w->writeC(op.enable?1:0);
w->writeC(op.am); w->writeC(op.am);
w->writeC(op.ar); w->writeC(op.ar);
w->writeC(op.dr); w->writeC(op.dr);
@ -566,6 +565,12 @@ void DivInstrument::putInsData(SafeWriter* w) {
w->writeC(ws.param2); w->writeC(ws.param2);
w->writeC(ws.param3); w->writeC(ws.param3);
w->writeC(ws.param4); w->writeC(ws.param4);
// FM per-operator enable
for (int j=0; j<4; j++) {
DivInstrumentFM::Operator& op=fm.op[j];
w->writeC(op.enable?1:0);
}
} }
DivDataErrors DivInstrument::readMacroData(DivInstrumentMacro& m, SafeReader& reader, short version) { DivDataErrors DivInstrument::readMacroData(DivInstrumentMacro& m, SafeReader& reader, short version) {
@ -632,9 +637,6 @@ DivDataErrors DivInstrument::readInsData(SafeReader& reader, short version) {
for (int j=0; j<4; j++) { for (int j=0; j<4; j++) {
DivInstrumentFM::Operator& op=fm.op[j]; DivInstrumentFM::Operator& op=fm.op[j];
if (istest) {
op.enable=reader.readC();
}
op.am=reader.readC(); op.am=reader.readC();
op.ar=reader.readC(); op.ar=reader.readC();
op.dr=reader.readC(); op.dr=reader.readC();
@ -1260,6 +1262,14 @@ DivDataErrors DivInstrument::readInsData(SafeReader& reader, short version) {
ws.param3=reader.readC(); ws.param3=reader.readC();
ws.param4=reader.readC(); ws.param4=reader.readC();
} }
// FM per-operator enable
if (istest) {
for (int j=0; j<4; j++) {
DivInstrumentFM::Operator& op=fm.op[j];
op.enable=reader.readC();
}
}
return DIV_DATA_SUCCESS; return DIV_DATA_SUCCESS;
} }