[Scummvm-cvs-logs] CVS: residual engine.h,1.16,1.17 smush.cpp,1.54,1.55

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29602

Modified Files:
	engine.h smush.cpp 
Log Message:
cleanup

Index: engine.h
===================================================================
RCS file: /cvsroot/scummvm/residual/engine.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- engine.h	31 Dec 2004 21:35:04 -0000	1.16
+++ engine.h	1 Jan 2005 10:12:15 -0000	1.17
@@ -168,4 +168,7 @@
 
 extern Engine *g_engine;
 
+void vimaInit(uint16 *destTable);
+void decompressVima(const byte *src, int16 *dest, int destLen, uint16 *destTable);
+
 #endif

Index: smush.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/smush.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- smush.cpp	1 Jan 2005 09:57:33 -0000	1.54
+++ smush.cpp	1 Jan 2005 10:12:15 -0000	1.55
@@ -30,9 +30,6 @@
 
 Smush *g_smush;
 static uint16 smushDestTable[5786];
-void vimaInit(uint16 *destTable);
-void decompressVima(const byte *src, int16 *dest, int destLen, uint16 *destTable);
-
 
 void Smush::timerCallback(void *refCon) {
 	g_smush->handleFrame();
@@ -138,7 +135,7 @@
 
 	assert(tag == MKID_BE('FRME'));
 	size = _file.readUint32BE();
-	byte *frame = (byte*)malloc(size);
+	byte *frame = (byte *)malloc(size);
 	_file.read(frame, size);
 
 	do {
@@ -153,7 +150,7 @@
 				handleWave(frame + pos + 8 + 4, decompressed_size);
 			pos += READ_BE_UINT32(frame + pos + 4) + 8;
 		} else {
-			error("unknown tag");
+			error("Smush::handleFrame() unknown tag");
 		}
 	} while (pos < size);
 	free(frame);
@@ -189,7 +186,7 @@
 			_channels = READ_LE_UINT32(f_header + pos + 12);
 			pos += 20;
 		} else {
-			error("unknown tag");
+			error("Smush::handleFramesHeader() unknown tag");
 		}
 	} while (pos < size);
 	free(f_header);
@@ -263,7 +260,7 @@
 	_inBuf = (char *)calloc(1, 16385);
 
 	if (_handle) {
-		warning("File %s already opened", filename);
+		warning("zlibFile::open() File %s already opened", filename);
 		return false;
 	}
 
@@ -272,7 +269,7 @@
 
 	_handle = g_resourceloader->openNewStream(filename);
 	if (!_handle) {
-		warning("zlibFile %s not found", filename);
+		warning("zlibFile::open() zlibFile %s not found", filename);
 		return false;
 	}
 
@@ -283,7 +280,7 @@
 	fread(_inBuf, 6, sizeof(char), _handle);				// XFlags
 
 	if (((flags & 0x04) != 0) || ((flags & 0x10) != 0))		// Xtra & Comment
-		error("Unsupported header flag");
+		error("zlibFile::open() Unsupported header flag");
 
 	if ((flags & 0x08) != 0) {					// Orig. Name
 		do {
@@ -300,7 +297,7 @@
 	_stream.opaque = Z_NULL;
 
 	if (inflateInit2(&_stream, -15) != Z_OK)
-		error("inflateInit2 failed");
+		error("zlibFile::open() inflateInit2 failed");
 
 	_stream.next_in = NULL;
 	_stream.next_out = NULL;
@@ -331,7 +328,7 @@
 	bool fileEOF = false;
 
 	if (_handle == NULL) {
-		error("File is not open!");
+		error("zlibFile::read() File is not open!");
 		return 0;
 	}
 
@@ -354,17 +351,17 @@
 
 		result = inflate(&_stream, Z_NO_FLUSH);
 		if (result == Z_STREAM_END) {	// EOF
-			warning("Stream ended");
+			warning("zlibFile::read() Stream ended");
 			_fileDone = true;
 			break;
 		}
 		if (result == Z_DATA_ERROR) {
-			warning("Decompression error");
+			warning("zlibFile::read() Decompression error");
 			_fileDone = true;
 			break;
 		}
 		if (result != Z_OK || fileEOF) {
-			warning("Unknown decomp result: %d/%d\n", result, fileEOF);
+			warning("zlibFile::read() Unknown decomp result: %d/%d\n", result, fileEOF);
 			_fileDone = true;
 			break;
 		}