diff options
| author | Torbjörn Andersson | 2010-12-30 22:43:20 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2010-12-30 22:43:20 +0000 |
| commit | 9f9035c3df7aa4accec62cbb72c54dc680eb68f9 (patch) | |
| tree | d1f0c072f17d6690320f8261e611d35984619c46 | |
| parent | 542f946155450589480ed95e4ab2f49846d1d2ab (diff) | |
| download | scummvm-rg350-9f9035c3df7aa4accec62cbb72c54dc680eb68f9.tar.gz scummvm-rg350-9f9035c3df7aa4accec62cbb72c54dc680eb68f9.tar.bz2 scummvm-rg350-9f9035c3df7aa4accec62cbb72c54dc680eb68f9.zip | |
FMOPL: Fix GCC warnings when DBOPL_WAVE is not WAVE_TABLEMUL.
svn-id: r55069
| -rw-r--r-- | sound/softsynth/opl/dbopl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/softsynth/opl/dbopl.cpp b/sound/softsynth/opl/dbopl.cpp index 857ed78436..47e263b6b9 100644 --- a/sound/softsynth/opl/dbopl.cpp +++ b/sound/softsynth/opl/dbopl.cpp @@ -224,7 +224,7 @@ static inline Bits MakeVolume( Bitu wave, Bitu volume ) { } #endif return (sig >> exp); -}; +} static Bits DB_FASTCALL WaveForm0( Bitu i, Bitu volume ) { Bits neg = 0 - (( i >> 9) & 1);//Create ~0 or 0 @@ -576,7 +576,7 @@ INLINE Bits Operator::GetWave( Bitu index, Bitu vol ) { return (waveBase[ index & waveMask ] * MulTable[ vol >> ENV_EXTRA ]) >> MUL_SH; #elif ( DBOPL_WAVE == WAVE_TABLELOG ) Bit32s wave = waveBase[ index & waveMask ]; - Bit32u total = ( wave & 0x7fff ) + vol << ( 3 - ENV_EXTRA ); + Bit32u total = ( wave & 0x7fff ) + ( vol << ( 3 - ENV_EXTRA ) ); Bit32s sig = ExpTable[ total & 0xff ]; Bit32u exp = total >> 8; Bit32s neg = wave >> 16; |