From e58fb42d52d30d00923339f80c1148daeee05b6a Mon Sep 17 00:00:00 2001 From: tildearrow Date: Mon, 12 Dec 2022 17:18:13 -0500 Subject: [PATCH] resVol isn't shared --- src/engine/chipUtils.h | 5 ++--- src/engine/platform/n163.h | 2 ++ src/engine/platform/qsound.h | 4 +++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/engine/chipUtils.h b/src/engine/chipUtils.h index 13c302f7a..073783ef8 100644 --- a/src/engine/chipUtils.h +++ b/src/engine/chipUtils.h @@ -56,11 +56,10 @@ struct SharedChannelFreq: public SharedChannel { // common shared channel volume struct template struct SharedChannelVolume { - T vol, outVol, resVol; + T vol, outVol; SharedChannelVolume(T initVol): vol(initVol), - outVol(initVol), - resVol(initVol) {} + outVol(initVol) {} }; #endif diff --git a/src/engine/platform/n163.h b/src/engine/platform/n163.h index 50142472b..c1af69190 100644 --- a/src/engine/platform/n163.h +++ b/src/engine/platform/n163.h @@ -28,6 +28,7 @@ class DivPlatformN163: public DivDispatch { struct Channel: public SharedChannelFreq, public SharedChannelVolume { + signed char resVol; short wave, wavePos, waveLen; unsigned char waveMode; short loadWave, loadPos, loadLen; @@ -43,6 +44,7 @@ class DivPlatformN163: public DivDispatch { Channel(): SharedChannelFreq(), SharedChannelVolume(15), + resVol(15), wave(-1), wavePos(0), waveLen(0), diff --git a/src/engine/platform/qsound.h b/src/engine/platform/qsound.h index a48709886..6586e5df7 100644 --- a/src/engine/platform/qsound.h +++ b/src/engine/platform/qsound.h @@ -27,6 +27,7 @@ class DivPlatformQSound: public DivDispatch { struct Channel: public SharedChannelFreq, public SharedChannelVolume { + int resVol; int sample, wave; int panning; int echo; @@ -38,7 +39,8 @@ class DivPlatformQSound: public DivDispatch { } Channel(): SharedChannelFreq(), - SharedChannelVolume(4095), + SharedChannelVolume(255), + resVol(4095), sample(-1), panning(0x10), echo(0),