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

Merge pull request #633 from djtuBIG-MaliceX/hotfix/WOPL-OPLI-2x2op-missing-FeedConnect-fix

Browse source 
WOPL/OPLI Load bugfix for 2nd 2op pair
This commit is contained in:
tildearrow 2022-08-15 05:35:15 -05:00 committed by GitHub
parent 20c5e14f26 6344a1d23f
commit e5e024c5f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/engine/fileOpsIns.cpp
View file

@ -733,6 +733,8 @@ void DivEngine::loadOPLI(SafeReader& reader, std::vector<DivInstrument*>& ret, S
ins = new DivInstrument; ins = new DivInstrument;
ins->type = DIV_INS_OPL; ins->type = DIV_INS_OPL;
ins->name = fmt::sprintf("%s (2)", insName); ins->name = fmt::sprintf("%s (2)", insName);
ins->fm.alg = (feedConnect2nd & 0x1);
ins->fm.fb = ((feedConnect2nd >> 1) & 0xF);
for (int i : {1,0}) { for (int i : {1,0}) {
readOpliOp(reader, ins->fm.op[i]); readOpliOp(reader, ins->fm.op[i]);
} }
@ -1498,6 +1500,8 @@ void DivEngine::loadWOPL(SafeReader& reader, std::vector<DivInstrument*>& ret, S
ins = new DivInstrument; ins = new DivInstrument;
ins->type = DIV_INS_OPL; ins->type = DIV_INS_OPL;
ins->name = fmt::sprintf("%s (2)", insName); ins->name = fmt::sprintf("%s (2)", insName);
ins->fm.alg = (feedConnect2nd & 0x1);
ins->fm.fb = ((feedConnect2nd >> 1) & 0xF);
for (int i : {1,0}) { for (int i : {1,0}) {
patchSum += readWoplOp(reader, ins->fm.op[i]); patchSum += readWoplOp(reader, ins->fm.op[i]);
} }