From 6d5529e0dd631f38ef4932bdca015c89d4bb5c42 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 24 Aug 2002 21:57:00 +0000
Subject: fixed warnings

svn-id: r4833
---
 scumm/debug.cpp               |  2 +-
 scumm/smush/codec47.cpp       |  2 +-
 scumm/smush/imuse_channel.cpp |  4 ++--
 scumm/smush/saud_channel.cpp  | 16 ++++++++--------
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'scumm')

diff --git a/scumm/debug.cpp b/scumm/debug.cpp
index 6957f13bf4..1f37e01df6 100644
--- a/scumm/debug.cpp
+++ b/scumm/debug.cpp
@@ -270,7 +270,7 @@ void ScummDebugger::printActors(int act)
 				printf("|%2d|%4d|%3d  %3d|%4d|%3d|%5d|%3d|%3d|%2d|%5d|%5d|%3d|%3d|$%02x|\n",
 							 a->number, a->room, a->x, a->y, a->elevation, a->costume,
 							 a->width, a->walkbox, a->moving, a->forceClip, a->frame,
-							 a->scalex, a->speedx, a->facing, _s->_classData[a->number]);
+							 a->scalex, a->speedx, a->facing, int(_s->_classData[a->number]&0xFF));
 		}
 	}
 	printf("+--------------------------------------------------------------+\n");
diff --git a/scumm/smush/codec47.cpp b/scumm/smush/codec47.cpp
index 92c0c14d3f..16f2145ec9 100644
--- a/scumm/smush/codec47.cpp
+++ b/scumm/smush/codec47.cpp
@@ -28,7 +28,7 @@ DumpDecoder::~DumpDecoder() {
 }
 
 bool DumpDecoder::decode(Blitter & dst, Chunk & src) {
-	int n = 0, i = 0;
+	int i = 0;
 	int seq = src.getWord();
 	int codec = src.getByte();
 	int flags = src.getByte();
diff --git a/scumm/smush/imuse_channel.cpp b/scumm/smush/imuse_channel.cpp
index 43d17a60f4..94aab12519 100644
--- a/scumm/smush/imuse_channel.cpp
+++ b/scumm/smush/imuse_channel.cpp
@@ -193,10 +193,10 @@ void ImuseChannel::decode() {
 }
 
 bool ImuseChannel::handleSubTags(int & offset) {
-	int available_size = _tbufferSize - offset;
-	if(available_size >= 8) {
+	if(_tbufferSize - offset >= 8) {
 		Chunk::type type = READ_BE_UINT32(_tbuffer + offset);
 		unsigned int size = READ_BE_UINT32(_tbuffer + offset + 4);
+		unsigned int available_size = _tbufferSize - offset;
 		switch(type) {
 			case TYPE_MAP_: 
 				_inData = false;
diff --git a/scumm/smush/saud_channel.cpp b/scumm/smush/saud_channel.cpp
index 8e5480c3a1..36f06f2832 100644
--- a/scumm/smush/saud_channel.cpp
+++ b/scumm/smush/saud_channel.cpp
@@ -47,10 +47,10 @@ void SaudChannel::handleShdr(Chunk & b) {
 }
 
 bool SaudChannel::handleSubTags(int & offset) {
-	int available_size = _tbufferSize - offset;
-	if(available_size >= 8) {
+	if(_tbufferSize - offset >= 8) {
 		Chunk::type type = READ_BE_UINT32(_tbuffer + offset);
 		unsigned int size = READ_BE_UINT32(_tbuffer + offset + 4);
+		unsigned int available_size = _tbufferSize - offset;
 
 		switch(type) {
 			case TYPE_STRK:
@@ -166,14 +166,14 @@ SaudChannel::SaudChannel(int track, int freq) :
 			_track(track), 
 			_nbframes(0),
 			_dataSize(-1),
-			_tbuffer(0), 
-			_sbuffer(0), 
 			_frequency(freq),
-			_tbufferSize(0), 
-			_sbufferSize(0), 
 			_inData(false),
-			_markReached(false)
-			{
+			_markReached(false),
+			_tbuffer(0),
+			_tbufferSize(0),
+			_sbuffer(0),
+			_sbufferSize(0)
+{
 }
 
 SaudChannel::~SaudChannel() {
-- 
cgit v1.2.3