diff options
author | Max Horn | 2007-08-16 18:42:28 +0000 |
---|---|---|
committer | Max Horn | 2007-08-16 18:42:28 +0000 |
commit | 47b2f533f0a5e2e70759b90f798c66d3b763a0d9 (patch) | |
tree | 16b4944b09df2b7794192f52ea73198b9a18e485 /engines | |
parent | f0f46113ee103e922ecde5f32652a482899c7e61 (diff) | |
download | scummvm-rg350-47b2f533f0a5e2e70759b90f798c66d3b763a0d9.tar.gz scummvm-rg350-47b2f533f0a5e2e70759b90f798c66d3b763a0d9.tar.bz2 scummvm-rg350-47b2f533f0a5e2e70759b90f798c66d3b763a0d9.zip |
Fixed some warning
svn-id: r28638
Diffstat (limited to 'engines')
-rw-r--r-- | engines/agi/sound.cpp | 7 | ||||
-rw-r--r-- | engines/agi/sound.h | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/agi/sound.cpp b/engines/agi/sound.cpp index 0fe294af45..9b2f88cff6 100644 --- a/engines/agi/sound.cpp +++ b/engines/agi/sound.cpp @@ -77,7 +77,7 @@ PCjrSound::PCjrSound(uint8 *data, uint32 len, int resnum, SoundMgr &manager) : A } const uint8 *PCjrSound::getVoicePointer(uint voiceNum) { - assert(voiceNum >= 0 && voiceNum < 4); + assert(voiceNum < 4); uint16 voiceStartOffset = READ_LE_UINT16(_data + voiceNum * 2); return _data + voiceStartOffset; } @@ -193,11 +193,11 @@ bool IIgsOscillatorList::finalize(Common::SeekableReadStream &uint8Wave) { bool IIgsInstrumentHeader::read(Common::SeekableReadStream &stream, bool ignoreAddr) { env.read(stream); relseg = stream.readByte(); - byte priority = stream.readByte(); // Not needed? 32 in all tested data. + /*byte priority =*/ stream.readByte(); // Not needed? 32 in all tested data. bendrange = stream.readByte(); vibdepth = stream.readByte(); vibspeed = stream.readByte(); - byte spare = stream.readByte(); // Not needed? 0 in all tested data. + /*byte spare =*/ stream.readByte(); // Not needed? 0 in all tested data. byte wac = stream.readByte(); // Read A wave count byte wbc = stream.readByte(); // Read B wave count oscList.read(stream, wac, ignoreAddr); // Read the oscillators @@ -787,7 +787,6 @@ bool SoundMgr::convertWave(Common::SeekableReadStream &source, int16 *dest, uint } Common::MemoryReadStream *SoundMgr::loadWaveFile(const Common::String &wavePath, const IIgsExeInfo &exeInfo) { - bool loadedOk = false; // Was loading successful? Common::File file; // Open the wave file and read it into memory diff --git a/engines/agi/sound.h b/engines/agi/sound.h index 058f4ab67e..80ba3f31e8 100644 --- a/engines/agi/sound.h +++ b/engines/agi/sound.h @@ -207,6 +207,7 @@ class SoundMgr; class AgiSound { public: AgiSound(SoundMgr &manager) : _manager(manager), _isPlaying(false), _isValid(false) {} + virtual ~AgiSound() {} virtual void play() { _isPlaying = true; } virtual void stop() { _isPlaying = false; } virtual bool isPlaying() { return _isPlaying; } |