[Scummvm-cvs-logs] SF.net SVN: scummvm: [29922] scummvm/trunk/engines/cruise

[fingolfin at users.sourceforge.net]

Revision: 29922
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29922&view=rev
Author:   fingolfin
Date:     2007-12-20 07:00:09 -0800 (Thu, 20 Dec 2007)

Log Message:
-----------
Fix compiler warnings

Modified Paths:
--------------
    scummvm/trunk/engines/cruise/cruise_main.cpp
    scummvm/trunk/engines/cruise/saveload.cpp
    scummvm/trunk/engines/cruise/script.cpp

Modified: scummvm/trunk/engines/cruise/cruise_main.cpp
===================================================================
--- scummvm/trunk/engines/cruise/cruise_main.cpp	2007-12-20 14:57:05 UTC (rev 29921)
+++ scummvm/trunk/engines/cruise/cruise_main.cpp	2007-12-20 15:00:09 UTC (rev 29922)
@@ -990,7 +990,7 @@
 					thisOvl = j;
 				}
 
-				const char* pName = getObjectName(ptrHead->obj1Number, overlayTable[thisOvl].ovlData->arrayNameObj);
+				//const char* pName = getObjectName(ptrHead->obj1Number, overlayTable[thisOvl].ovlData->arrayNameObj);
 
 				objDataStruct* pObject = getObjectDataFromOverlay(thisOvl, ptrHead->obj1Number);
 

Modified: scummvm/trunk/engines/cruise/saveload.cpp
===================================================================
--- scummvm/trunk/engines/cruise/saveload.cpp	2007-12-20 14:57:05 UTC (rev 29921)
+++ scummvm/trunk/engines/cruise/saveload.cpp	2007-12-20 15:00:09 UTC (rev 29922)
@@ -565,7 +565,7 @@
 
 	currentSaveFile->write(musicName, 15);
 	
-	char dummy[6] = { 0, 0, 0, 0, 0, 0 };
+	const char dummy[6] = { 0, 0, 0, 0, 0, 0 };
 	currentSaveFile->write(dummy, 6);
 
 	currentSaveFile->write(currentCtpName, 40);
@@ -593,7 +593,6 @@
 		}
 		currentSaveFile->writeUint16LE(filesDatabase[i].subData.index);
 		currentSaveFile->write(filesDatabase[i].subData.name, 13);
-		char dummy[1] = {0};
 		currentSaveFile->write(dummy, 1);
 		currentSaveFile->writeUint16LE(filesDatabase[i].subData.transparency);
 		if(filesDatabase[i].subData.ptrMask) {
@@ -609,7 +608,6 @@
 	for(int i=0; i<numOfLoadedOverlay; i++)
 	{
 		currentSaveFile->write(overlayTable[i].overlayName, 13);
-		char dummy[4] = { 0, 0, 0, 0 };
 		currentSaveFile->write(dummy, 1);
 		currentSaveFile->write(dummy, 4);
 		currentSaveFile->writeUint16LE(overlayTable[i].alreadyLoaded);
@@ -624,7 +622,6 @@
 	for(int i=0; i<64; i++)
 	{
 		currentSaveFile->write(preloadData[i].name, 15);
-		char dummy[4] = { 0, 0, 0, 0 };
 		currentSaveFile->write(dummy, 1);
 		currentSaveFile->writeUint32LE(preloadData[i].size);
 		currentSaveFile->writeUint32LE(preloadData[i].sourceSize);

Modified: scummvm/trunk/engines/cruise/script.cpp
===================================================================
--- scummvm/trunk/engines/cruise/script.cpp	2007-12-20 14:57:05 UTC (rev 29921)
+++ scummvm/trunk/engines/cruise/script.cpp	2007-12-20 15:00:09 UTC (rev 29922)
@@ -67,8 +67,7 @@
 			uint8 *address = 0;
 			int type = getByteFromScript();
 			int ovl = getByteFromScript();
-			short int offset;
-			short int firstOffset = offset = getShortFromScript();
+			short int offset = getShortFromScript();
 			offset += index;
 
 			int typ7 = type & 7;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.