[Scummvm-cvs-logs] SF.net SVN: scummvm:[48879] scummvm/trunk/engines/kyra

[athrxx at users.sourceforge.net]

Revision: 48879
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48879&view=rev
Author:   athrxx
Date:     2010-05-01 12:55:32 +0000 (Sat, 01 May 2010)

Log Message:
-----------
KYRA: fixed some cppcheck warnings

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sequences_hof.cpp
    scummvm/trunk/engines/kyra/sound_towns.cpp

Modified: scummvm/trunk/engines/kyra/sequences_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_hof.cpp	2010-05-01 10:19:35 UTC (rev 48878)
+++ scummvm/trunk/engines/kyra/sequences_hof.cpp	2010-05-01 12:55:32 UTC (rev 48879)
@@ -133,8 +133,6 @@
 		}
 
 		if (cseq.flags & 1) {
-			int w2 = _seqWsa->width();
-			int h2 = _seqWsa->height();
 			int x = cseq.xPos;
 			int y = cseq.yPos;
 
@@ -142,13 +140,13 @@
 
 			if (_seqWsa) {
 				if (x < 0) {
+					_seqWsa->setWidth(_seqWsa->width() + x);
 					x = 0;
-					w2 = 0;
 				}
 
 				if (y < 0) {
+					_seqWsa->setHeight(_seqWsa->height() + y);
 					y = 0;
-					h2 = 0;
 				}
 
 				if (cseq.xPos + _seqWsa->width() > 319)

Modified: scummvm/trunk/engines/kyra/sound_towns.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_towns.cpp	2010-05-01 10:19:35 UTC (rev 48878)
+++ scummvm/trunk/engines/kyra/sound_towns.cpp	2010-05-01 12:55:32 UTC (rev 48879)
@@ -153,7 +153,7 @@
 	void loadDataToCurrentPosition(uint8 *trackdata, uint32 size, bool loop = 0);
 	void loadDataToEndOfQueue(uint8 *trackdata, uint32 size, bool loop = 0);
 	void setPlayBackStatus(bool playing);
-	bool isPlaying() {return _playing; }
+	bool isPlaying() const {return _playing; }
 	uint8 *trackData() {return _trackData; }
 
 	bool _loop;
@@ -1491,7 +1491,7 @@
 
 	void nextTick(int32 *buffer, uint32 bufferSize);
 
-	uint8 chanEnable() { return _chanEnable; }
+	uint8 chanEnable() const { return _chanEnable; }
 private:
 	void updatesRegs();
 
@@ -2561,6 +2561,7 @@
 	_timer(0), _noiseGenerator(0), _chanEnable(0) {
 
 	memset(_channels, 0, sizeof(_channels));
+	memset(_updateRequestBuf, 0, sizeof(_updateRequestBuf));
 	_reg = new uint8 *[11];
 
 	_reg[0] = &_channels[0].frqL;


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