From b5a4edf00cea0449a544f6a5989c661ec5da0df9 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 22 Sep 2002 00:20:23 +0000
Subject: guess what? riiight! more warning fixes :-)

svn-id: r4993
---
 scumm/smush/codec47.cpp        | 7 ++-----
 scumm/smush/codec47.h          | 2 +-
 scumm/smush/frenderer.cpp      | 2 +-
 scumm/smush/player.cpp         | 8 +++++---
 scumm/smush/scumm_renderer.cpp | 4 ++--
 5 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'scumm')

diff --git a/scumm/smush/codec47.cpp b/scumm/smush/codec47.cpp
index f1ae149e26..da253f5d18 100644
--- a/scumm/smush/codec47.cpp
+++ b/scumm/smush/codec47.cpp
@@ -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();
diff --git a/scumm/smush/codec47.h b/scumm/smush/codec47.h
index 4b793147b6..82712099b8 100644
--- a/scumm/smush/codec47.h
+++ b/scumm/smush/codec47.h
@@ -31,7 +31,7 @@
 */
 class DumpDecoder : public Decoder {
 public:
-	virtual ~DumpDecoder();
+	virtual ~DumpDecoder() {}
 	bool decode(Blitter &, Chunk &);
 };
 
diff --git a/scumm/smush/frenderer.cpp b/scumm/smush/frenderer.cpp
index 93534d7c02..008655fdcd 100644
--- a/scumm/smush/frenderer.cpp
+++ b/scumm/smush/frenderer.cpp
@@ -295,7 +295,7 @@ bool FontRenderer::drawStringWrap(const char * str, char * buffer, const Point &
 		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];
diff --git a/scumm/smush/player.cpp b/scumm/smush/player.cpp
index b87aed7d9a..ea0d592460 100644
--- a/scumm/smush/player.cpp
+++ b/scumm/smush/player.cpp
@@ -293,6 +293,7 @@ void SmushPlayer::handleFetch(Chunk & b) {
 
 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;
+
 	_Channel * c = _mixer->findChannel(track);
 	if(c == 0) {
 		c = new ImuseChannel(track, _soundFrequency);
@@ -313,6 +314,7 @@ void SmushPlayer::handleImuseAction8(Chunk & b, int32 flags, int32 unknown, int3
 	int32 size = b.getDword();
 	int32 bsize = b.getSize() - 18;
 	handleImuseBuffer(track_id, index, nbframes, size, unknown, track_flags, b, bsize);
+
 }
 
 void SmushPlayer::handleImuseAction(Chunk & b) {
@@ -346,8 +348,8 @@ void SmushPlayer::handleTextResource(Chunk & b) {
 	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 @@ bool SmushPlayer::play(const char * file, const char * directory) {
 				_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);
diff --git a/scumm/smush/scumm_renderer.cpp b/scumm/smush/scumm_renderer.cpp
index 184d03e4b7..07da819e0b 100644
--- a/scumm/smush/scumm_renderer.cpp
+++ b/scumm/smush/scumm_renderer.cpp
@@ -76,7 +76,7 @@ _Channel * ScummMixer::findChannel(int32 track) {
 
 bool ScummMixer::addChannel(_Channel * c) {
 	int32 track = c->getTrackIdentifier();
-	int32 i;
+	int i;
 
 	debug(9, "ScummMixer::addChannel(%d)", track);
 
@@ -109,7 +109,7 @@ bool ScummMixer::addChannel(_Channel * c) {
 	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);
-- 
cgit v1.2.3