diff options
| author | James Brown | 2002-03-10 17:21:38 +0000 |
|---|---|---|
| committer | James Brown | 2002-03-10 17:21:38 +0000 |
| commit | 31dc24a037f9673441cf7a5295138b89c9d6d911 (patch) | |
| tree | fd7e11ced5c030c2cbb8071de1d202ff9af2813a /sound | |
| parent | ea9a17a4e6f149040f6297b36cc395467f80842e (diff) | |
| download | scummvm-rg350-31dc24a037f9673441cf7a5295138b89c9d6d911.tar.gz scummvm-rg350-31dc24a037f9673441cf7a5295138b89c9d6d911.tar.bz2 scummvm-rg350-31dc24a037f9673441cf7a5295138b89c9d6d911.zip | |
Removed more warnings and logic errors.
Now compiles with -Wall under GCC.
svn-id: r3722
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/adlib.cpp | 2 | ||||
| -rw-r--r-- | sound/fmopl.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sound/adlib.cpp b/sound/adlib.cpp index a2ea956d24..792617f388 100644 --- a/sound/adlib.cpp +++ b/sound/adlib.cpp @@ -544,7 +544,7 @@ byte AdlibSoundDriver::struct10_ontimer(Struct10 *s10, Struct11 *s11) { result = 1; } } - assert(s10->num_steps>=0); + if (!--s10->num_steps) { s10->active++; if (s10->active > 4) { diff --git a/sound/fmopl.cpp b/sound/fmopl.cpp index f079a71721..55da77e793 100644 --- a/sound/fmopl.cpp +++ b/sound/fmopl.cpp @@ -93,8 +93,6 @@ static const int slot_array[32]= -1,-1,-1,-1,-1,-1,-1,-1 }; -#pragma warning (disable: 4244) - /* key scale level */ /* table is 3dB/OCT , DV converts this in TL step at 6dB/OCT */ |