diff options
| author | Max Horn | 2005-01-10 22:46:23 +0000 |
|---|---|---|
| committer | Max Horn | 2005-01-10 22:46:23 +0000 |
| commit | f030081647882ae537ffe6493f0b7764ce655245 (patch) | |
| tree | f61d024c4a911c3b01d1b18a81eff13ce3095cce /sound | |
| parent | f3f1d6be874ef032284980bd5739bd57bda48237 (diff) | |
| download | scummvm-rg350-f030081647882ae537ffe6493f0b7764ce655245.tar.gz scummvm-rg350-f030081647882ae537ffe6493f0b7764ce655245.tar.bz2 scummvm-rg350-f030081647882ae537ffe6493f0b7764ce655245.zip | |
eek, we put a static RandomSource instance into every file that included fmopl.h...
svn-id: r16532
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/fmopl.cpp | 4 | ||||
| -rw-r--r-- | sound/fmopl.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sound/fmopl.cpp b/sound/fmopl.cpp index 5b133a21f2..b6686a8962 100644 --- a/sound/fmopl.cpp +++ b/sound/fmopl.cpp @@ -38,6 +38,10 @@ #include "common/config-manager.h" #endif + +static Common::RandomSource oplRnd; /* OPL random number generator */ + + /* -------------------- preliminary define section --------------------- */ /* attack/decay rate time rate */ #define OPL_ARRATE 141280 /* RATE 4 = 2826.24ms @ 3.6MHz */ diff --git a/sound/fmopl.h b/sound/fmopl.h index 13388bacd9..701238dc40 100644 --- a/sound/fmopl.h +++ b/sound/fmopl.h @@ -27,7 +27,6 @@ #define FMOPL_H_ #include "common/scummsys.h" -#include "common/util.h" enum { FMOPL_ENV_BITS_HQ = 16, @@ -160,8 +159,6 @@ int OPLTimerOver(FM_OPL *OPL, int c); void OPLWriteReg(FM_OPL *OPL, int r, int v); void YM3812UpdateOne(FM_OPL *OPL, int16 *buffer, int length); -static Common::RandomSource oplRnd; /* OPL random number generator */ - #endif // Factory method |