[Scummvm-cvs-logs] CVS: scummvm-new/scumm saveload.cpp,1.3,1.4

Max Horn fingolfin at users.sourceforge.net
Mon Aug 26 09:14:04 CEST 2002


Update of /cvsroot/scummvm/scummvm-new/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv11778/scumm

Modified Files:
	saveload.cpp 
Log Message:
fix endian issue for old savegames created on big endian system when trying to load them on little endian systems

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/saveload.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- saveload.cpp	25 Aug 2002 11:35:12 -0000	1.3
+++ saveload.cpp	26 Aug 2002 16:13:38 -0000	1.4
@@ -96,8 +96,10 @@
 		return false;
 	}
 
+	// In older versions of ScummVM, the header version was not endian safe.
+	// We account for that by retrying once with swapped byte order.
 	if (hdr.ver < VER_V7 || hdr.ver > _current_version)
-		hdr.ver = TO_LE_32(hdr.ver);
+		hdr.ver = SWAP_BYTES(hdr.ver);
 	if (hdr.ver < VER_V7 || hdr.ver > _current_version)
 	{
 		warning("Invalid version of '%s'", filename);





More information about the Scummvm-git-logs mailing list