[Scummvm-cvs-logs] CVS: scummvm/scumm/smush codec47.cpp,1.4,1.5 codec47.h,1.3,1.4 frenderer.cpp,1.7,1.8 player.cpp,1.15,1.16 scumm_renderer.cpp,1.10,1.11

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory usw-pr-cvs1:/tmp/cvs-serv3149

Modified Files:
	codec47.cpp codec47.h frenderer.cpp player.cpp 
	scumm_renderer.cpp 
Log Message:
guess what? riiight! more warning fixes :-)

Index: codec47.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/codec47.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- codec47.cpp	30 Aug 2002 07:24:45 -0000	1.4
+++ codec47.cpp	22 Sep 2002 00:20:23 -0000	1.5
@@ -24,14 +24,11 @@
 #include "chunk.h"
 #include "blitter.h"
 
-DumpDecoder::~DumpDecoder() {
-}
-
 bool DumpDecoder::decode(Blitter & dst, Chunk & src) {
 	int32 i = 0;
-	int32 seq = src.getWord();
+	/*int32 seq =*/ src.getWord();
 	int32 codec = src.getByte();
-	int32 flags = src.getByte();
+	/*int32 flags =*/ src.getByte();
 	int32 unknown[22];
 	for(i = 0; i < 0; i++) {
 		unknown[i] = src.getByte();

Index: codec47.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/codec47.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- codec47.h	24 Aug 2002 23:21:55 -0000	1.3
+++ codec47.h	22 Sep 2002 00:20:23 -0000	1.4
@@ -31,7 +31,7 @@
 */
 class DumpDecoder : public Decoder {
 public:
-	virtual ~DumpDecoder();
+	virtual ~DumpDecoder() {}
 	bool decode(Blitter &, Chunk &);
 };
 

Index: frenderer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/frenderer.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- frenderer.cpp	20 Sep 2002 05:46:03 -0000	1.7
+++ frenderer.cpp	22 Sep 2002 00:20:23 -0000	1.8
@@ -295,7 +295,7 @@
 		left_x = size.getX() - max_width;
 
 	for(i = 0; i < nb_subs; i++) {
-		int32 substr_width = substr_widths[i];
+//		int32 substr_width = substr_widths[i];
 		drawSubstring((const byte *)substrings[i], buffer, size, left_x, y);
 		y += stringHeight(substrings[i]);
 		delete []substrings[i];

Index: player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/player.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- player.cpp	21 Sep 2002 09:21:50 -0000	1.15
+++ player.cpp	22 Sep 2002 00:20:23 -0000	1.16
@@ -292,7 +292,8 @@
 }
 
 void SmushPlayer::handleImuseBuffer(int32 track_id, int32 index, int32 nbframes, int32 size, int32 unk1, int32 track_flags, Chunk & b, int32 bsize) {
-	int32 track = (track_flags << 16) | track_id;
+	int32 track = (track_flags << 16) | track_id;
+
 	_Channel * c = _mixer->findChannel(track);
 	if(c == 0) {
 		c = new ImuseChannel(track, _soundFrequency);
@@ -312,7 +313,8 @@
 	int32 nbframes = b.getWord();
 	int32 size = b.getDword();
 	int32 bsize = b.getSize() - 18;
-	handleImuseBuffer(track_id, index, nbframes, size, unknown, track_flags, b, bsize);
+	handleImuseBuffer(track_id, index, nbframes, size, unknown, track_flags, b, bsize);
+
 }
 
 void SmushPlayer::handleImuseAction(Chunk & b) {
@@ -346,8 +348,8 @@
 	int32 left = b.getShort();
 	int32 top = b.getShort();
 	int32 width = b.getShort();
-	int32 height = b.getShort();
-	int32 unk2 = b.getWord();
+	/*int32 height =*/ b.getShort();
+	/*int32 unk2 =*/ b.getWord();
 	int32 string_id = b.getWord();
 	debug(6, "SmushPlayer::handleTextResource(%d)", string_id);
 	if(!_strings) return;
@@ -716,7 +718,7 @@
 				_fr[0] = loadFont("scummfnt.nut", directory, true);
 				_fr[2] = loadFont("titlfnt.nut", directory, true);
 			} else {
-				for(int32 i = 0; i < 4; i++) {
+				for(int i = 0; i < 4; i++) {
 					char file_font[20];
 					sprintf((char*)&file_font, "font%d.nut", i);
 					_fr[i] = loadFont(file_font, directory, i != 0);

Index: scumm_renderer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/scumm_renderer.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- scumm_renderer.cpp	18 Sep 2002 10:22:36 -0000	1.10
+++ scumm_renderer.cpp	22 Sep 2002 00:20:23 -0000	1.11
@@ -76,7 +76,7 @@
 
 bool ScummMixer::addChannel(_Channel * c) {
 	int32 track = c->getTrackIdentifier();
-	int32 i;
+	int i;
 
 	debug(9, "ScummMixer::addChannel(%d)", track);
 
@@ -109,7 +109,7 @@
 	fprintf(stderr, "_nextIndex == %d\n", _nextIndex);
 
 	for(i = 0; i < SoundMixer::NUM_CHANNELS; i++) {
-		fprintf(stderr, "channel %d : %p(%d, %d) %d %d\n", i, _channels[i].chan, 
+		fprintf(stderr, "channel %d : %p(%ld, %d) %d %d\n", i, _channels[i].chan, 
 			_channels[i].chan ? _channels[i].chan->getTrackIdentifier() : -1, 
 			_channels[i].chan ? _channels[i].chan->isTerminated() : 1, 
 			_channels[i].first, _channels[i].mixer_index);