zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #271 from khokh2001/master 

small nuked opl3 fix
This commit is contained in:
rheit 2015-02-18 11:27:13 -06:00
parent d8d2058ec6 fa2e2a8528
commit 19ef4a4fbd
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/oplsynth/nukedopl3.cpp
View File

@ -98,8 +98,7 @@ Bit16s envelope_calcsin0(Bit16u phase, Bit16u envelope) {
phase &= 0x3ff; phase &= 0x3ff;
Bit16u out = 0; Bit16u out = 0;
Bit16u neg = 0; Bit16u neg = 0;
if (phase & 0x200 && (phase & 0x1ff)) { if (phase & 0x200) {
phase--;
neg = ~0; neg = ~0;
} }
if (phase & 0x100) { if (phase & 0x100) {
@ -154,8 +153,7 @@ Bit16s envelope_calcsin4(Bit16u phase, Bit16u envelope) {
phase &= 0x3ff; phase &= 0x3ff;
Bit16u out = 0; Bit16u out = 0;
Bit16u neg = 0; Bit16u neg = 0;
if ((phase & 0x300) == 0x100 && (phase & 0xff)) { if ((phase & 0x300) == 0x100) {
phase--;
neg = ~0; neg = ~0;
} }
if (phase & 0x200) { if (phase & 0x200) {
@ -188,8 +186,7 @@ Bit16s envelope_calcsin5(Bit16u phase, Bit16u envelope) {
Bit16s envelope_calcsin6(Bit16u phase, Bit16u envelope) { Bit16s envelope_calcsin6(Bit16u phase, Bit16u envelope) {
phase &= 0x3ff; phase &= 0x3ff;
Bit16u neg = 0; Bit16u neg = 0;
if (phase & 0x200 && (phase & 0x1ff)) { if (phase & 0x200) {
phase--;
neg = ~0; neg = ~0;
} }
return envelope_calcexp(envelope << 3) ^ neg; return envelope_calcexp(envelope << 3) ^ neg;
@ -199,8 +196,7 @@ Bit16s envelope_calcsin7(Bit16u phase, Bit16u envelope) {
phase &= 0x3ff; phase &= 0x3ff;
Bit16u out = 0; Bit16u out = 0;
Bit16u neg = 0; Bit16u neg = 0;
if (phase & 0x200 && (phase & 0x1ff)) { if (phase & 0x200) {
phase--;
neg = ~0; neg = ~0;
phase = (phase & 0x1ff) ^ 0x1ff; phase = (phase & 0x1ff) ^ 0x1ff;
} }
@ -976,4 +972,4 @@ NukedOPL3::NukedOPL3(bool stereo) {
OPLEmul *NukedOPL3Create(bool stereo) { OPLEmul *NukedOPL3Create(bool stereo) {
return new NukedOPL3(stereo); return new NukedOPL3(stereo);
} }