[Scummvm-cvs-logs] CVS: scummvm/sky compact.cpp,1.27,1.28 control.cpp,1.82,1.83

[Robert Göffringmann]

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

Modified Files:
	compact.cpp control.cpp 
Log Message:
fix gcc warnings

Index: compact.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/compact.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- compact.cpp	15 Dec 2004 06:48:04 -0000	1.27
+++ compact.cpp	16 Dec 2004 02:19:10 -0000	1.28
@@ -159,7 +159,6 @@
 	_cptFile->read(_asciiBuf, asciiSize);
 
 	// and fill them with the compact data
-	uint32 debcnt = 0;
 	for (uint32 lcnt = 0; lcnt < _numDataLists; lcnt++) {
 		for (uint32 ecnt = 0; ecnt < _dataListLen[lcnt]; ecnt++) {
 			_cptSizes[lcnt][ecnt] = READ_LE_UINT16(srcPos++);

Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- control.cpp	15 Dec 2004 06:48:04 -0000	1.82
+++ control.cpp	16 Dec 2004 02:19:10 -0000	1.83
@@ -1169,8 +1169,8 @@
 	for (cnt = 0; cnt < _skyCompact->_numSaveIds; cnt++) {
 		uint16 numElems;
 		uint16 *rawCpt = (uint16*)_skyCompact->fetchCptInfo(_skyCompact->_saveIds[cnt], &numElems, NULL, NULL);
-		for (uint16 cnt = 0; cnt < numElems; cnt++)
-			STOSW(destPos, rawCpt[cnt]);
+		for (uint16 elemCnt = 0; elemCnt < numElems; elemCnt++)
+			STOSW(destPos, rawCpt[elemCnt]);
 	}
 
 	*(uint32 *)destBuf = TO_LE_32(destPos - destBuf); // save size
@@ -1204,21 +1204,21 @@
 	if ((saveType & SAVE_MEGA3) && (numElems < 54 + 13 + 13 + 13))
 		error("Cpt %s: Savedata doesn't match cpt size (%d)!\n", name, numElems);
 	if (saveType & SAVE_GRAFX) {
-		uint16 type, target, pos;
-		LODSW(*srcPos, type);
+		uint16 graphType, target, pos;
+		LODSW(*srcPos, graphType);
 		LODSW(*srcPos, target);
 		LODSW(*srcPos, pos);
 		// convert to new compact system..
 		destCpt->grafixProgPos = pos;
-		if (type == OG_PTR_NULL)
+		if (graphType == OG_PTR_NULL)
 			destCpt->grafixProgId = 0;
-		else if (type == OG_AUTOROUTE)
+		else if (graphType == OG_AUTOROUTE)
 			destCpt->grafixProgId = destCpt->animScratchId;
-		else if (type == OG_COMPACT)
+		else if (graphType == OG_COMPACT)
 			destCpt->grafixProgId = target;
-		else if (type == OG_TALKTABLE)
+		else if (graphType == OG_TALKTABLE)
 			destCpt->grafixProgId = TALKTABLE_LIST_ID | target;
-		else if (type == OG_COMPACTELEM)
+		else if (graphType == OG_COMPACTELEM)
 			destCpt->grafixProgId = *(uint16*)_skyCompact->getCompactElem(destCpt, target);
 		else 
 			error("Illegal GrafixProg type encountered for compact %s", name);