[Scummvm-cvs-logs] CVS: scummvm/saga sprite.cpp,1.39,1.40

Max Horn fingolfin at users.sourceforge.net
Sun Jan 9 07:38:01 CET 2005


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

Modified Files:
	sprite.cpp 
Log Message:
fix warning

Index: sprite.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sprite.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- sprite.cpp	9 Jan 2005 15:07:48 -0000	1.39
+++ sprite.cpp	9 Jan 2005 15:36:54 -0000	1.40
@@ -118,22 +118,22 @@
 		spritePointer = spriteListData;
 		spritePointer += offset;
 
-		MemoryReadStream readS(spritePointer, (_vm->_features & GF_MAC_RESOURCES) ? 8 : 4);
+		MemoryReadStream readS2(spritePointer, (_vm->_features & GF_MAC_RESOURCES) ? 8 : 4);
 
 		if (!(_vm->_features & GF_MAC_RESOURCES)) {
-			spriteInfo->xAlign = readS.readSByte();
-			spriteInfo->yAlign = readS.readSByte();
+			spriteInfo->xAlign = readS2.readSByte();
+			spriteInfo->yAlign = readS2.readSByte();
 
-			spriteInfo->width = readS.readByte();
-			spriteInfo->height = readS.readByte();
+			spriteInfo->width = readS2.readByte();
+			spriteInfo->height = readS2.readByte();
 		} else {
-			spriteInfo->xAlign = readS.readSint16BE();
-			spriteInfo->yAlign = readS.readSint16BE();
+			spriteInfo->xAlign = readS2.readSint16BE();
+			spriteInfo->yAlign = readS2.readSint16BE();
 
-			spriteInfo->width = readS.readUint16BE();
-			spriteInfo->height = readS.readUint16BE();
+			spriteInfo->width = readS2.readUint16BE();
+			spriteInfo->height = readS2.readUint16BE();
 		}
-		spriteDataPointer = spritePointer + readS.pos();
+		spriteDataPointer = spritePointer + readS2.pos();
 		outputLength = spriteInfo->width * spriteInfo->height;
 		decodeRLEBuffer(spriteDataPointer, 64000, outputLength); //todo: 64000 - should be replace by real input length
 		spriteInfo->decodedBuffer = (byte *) malloc(outputLength);





More information about the Scummvm-git-logs mailing list