[Scummvm-cvs-logs] CVS: scummvm/bs2 save_rest.cpp,1.4,1.5

Max Horn fingolfin at users.sourceforge.net
Mon Jul 28 05:05:14 CEST 2003


Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv26609

Modified Files:
	save_rest.cpp 
Log Message:
fix shadow warning

Index: save_rest.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/save_rest.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- save_rest.cpp	28 Jul 2003 09:49:45 -0000	1.4
+++ save_rest.cpp	28 Jul 2003 11:56:34 -0000	1.5
@@ -392,7 +392,7 @@
 uint32 GetSaveDescription(uint16 slotNo, uint8 *description)		// (James05feb97)
 {
 	char saveFileName[MAX_FILENAME_LEN];
-	_savegameHeader header;
+	_savegameHeader dummy;
 	FILE *fp;
 
 	sprintf(saveFileName, "saves\\savegame.%.3d", slotNo);			// construct filename
@@ -406,9 +406,9 @@
 	else
 	{
 //		fread(destAddress, size, count, fp);
-		fread(&header, sizeof(header), 1, fp);				// read header
+		fread(&dummy, sizeof(_savegameHeader), 1, fp);				// read header
 		fclose(fp);
-		sprintf((char*)description, header.description);
+		sprintf((char*)description, dummy.description);
 		return(SR_OK);
 	}
 }





More information about the Scummvm-git-logs mailing list