[Scummvm-cvs-logs] SF.net SVN: scummvm: [28638] scummvm/trunk/engines/agi

[fingolfin at users.sourceforge.net]

Revision: 28638
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28638&view=rev
Author:   fingolfin
Date:     2007-08-16 11:42:28 -0700 (Thu, 16 Aug 2007)

Log Message:
-----------
Fixed some warning

Modified Paths:
--------------
    scummvm/trunk/engines/agi/sound.cpp
    scummvm/trunk/engines/agi/sound.h

Modified: scummvm/trunk/engines/agi/sound.cpp
===================================================================
--- scummvm/trunk/engines/agi/sound.cpp	2007-08-16 17:28:18 UTC (rev 28637)
+++ scummvm/trunk/engines/agi/sound.cpp	2007-08-16 18:42:28 UTC (rev 28638)
@@ -77,7 +77,7 @@
 }
 
 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 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 @@
 }
 
 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

Modified: scummvm/trunk/engines/agi/sound.h
===================================================================
--- scummvm/trunk/engines/agi/sound.h	2007-08-16 17:28:18 UTC (rev 28637)
+++ scummvm/trunk/engines/agi/sound.h	2007-08-16 18:42:28 UTC (rev 28638)
@@ -207,6 +207,7 @@
 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; }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.