[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.171,1.172

James Brown ender at users.sourceforge.net
Sun Sep 12 05:16:08 CEST 2004


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

Modified Files:
	saveload.cpp 
Log Message:
Be a Better Programmer (tm)


Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -d -r1.171 -r1.172
--- saveload.cpp	10 Sep 2004 12:13:03 -0000	1.171
+++ saveload.cpp	12 Sep 2004 12:15:19 -0000	1.172
@@ -665,23 +665,17 @@
 	uint8 md5Backup[16];
 
 	// MD5 Operations: Backup on load, compare, and reset.
-	if (s->isLoading()) {
-		for (i=0; i<17; i++) md5Backup[i] = _gameMD5[i];
-	}
+	if (s->isLoading())
+		memcpy(_gameMD5, md5Backup, 16);
 
 	s->saveLoadEntries(this, mainEntries);
 
 	// MD5 Operations: Backup on load, compare, and reset.
-	if (s->isLoading()) {
-        	for (j = 0; j < 16; j++) {
-			if (_gameMD5[j] != md5Backup[j]) {
-				warning("Game was saved with different gamedata - you may encounter problems.");
-				_gameMD5[j] = md5Backup[j];
-				break;
-			}
-			_gameMD5[j] = md5Backup[j];
+	if (s->isLoading())
+		if (memcmp(md5Backup, _gameMD5, 16) != 0) {
+			warning("Game was saved with different gamedata - you may encounter problems.");
+ 			memcpy(_gameMD5, md5Backup, 16);
 		}
-	}
 
 
 	if (s->isLoading() && savegameVersion < VER(14))





More information about the Scummvm-git-logs mailing list