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

Merge branch 'master' into SID3

Browse source
This commit is contained in:
tildearrow 2024-09-13 23:46:03 -05:00
commit 47f36f99d9
188 changed files with 5790 additions and 546 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/engine/instrument.cpp
View file

@ -175,7 +175,11 @@ bool DivInstrumentMultiPCM::operator==(const DivInstrumentMultiPCM& other) {
_C(rc) &&
_C(lfo) &&
_C(vib) &&
_C(am)
_C(am) &&
_C(damp) &&
_C(pseudoReverb) &&
_C(lfoReset) &&
_C(levelDirect)
);
}
@ -938,6 +942,14 @@ void DivInstrument::writeFeatureMP(SafeWriter* w) {
w->writeC(multipcm.vib);
w->writeC(multipcm.am);
unsigned char next=(
(multipcm.damp?1:0)&
(multipcm.pseudoReverb?2:0)&
(multipcm.lfoReset?4:0)&
(multipcm.levelDirect?8:0)
);
w->writeC(next);
FEATURE_END;
}
@ -1386,6 +1398,12 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song, bo
featureS2=true;
featureS3=true;
break;
case DIV_INS_SUPERVISION:
featureSM=true;
if (amiga.useSample) featureSL=true;
break;
case DIV_INS_UPD1771C:
break;
case DIV_INS_MAX:
break;
case DIV_INS_NULL:
@ -2337,6 +2355,14 @@ void DivInstrument::readFeatureMP(SafeReader& reader, short version) {
multipcm.vib=reader.readC();
multipcm.am=reader.readC();
if (version>=221) {
unsigned char next=reader.readC();
multipcm.damp=next&1;
multipcm.pseudoReverb=next&2;
multipcm.lfoReset=next&4;
multipcm.levelDirect=next&8;
}
READ_FEAT_END;
}
@ -3676,4 +3702,4 @@ DivInstrument& DivInstrument::operator=( const DivInstrument& ins ) {
*(DivInstrumentPOD*)this=ins;
name=ins.name;
return *this;
}
}