[Scummvm-cvs-logs] scummvm master -> bce549f42a374e47c5de794c863d6cbe0842bfb4

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
bce549f42a SWORD25: Fix bug with loading saves when some saves are missing


Commit: bce549f42a374e47c5de794c863d6cbe0842bfb4
    https://github.com/scummvm/scummvm/commit/bce549f42a374e47c5de794c863d6cbe0842bfb4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2011-06-26T06:10:34-07:00

Commit Message:
SWORD25: Fix bug with loading saves when some saves are missing

Changed paths:
    engines/sword25/gfx/staticbitmap.cpp



diff --git a/engines/sword25/gfx/staticbitmap.cpp b/engines/sword25/gfx/staticbitmap.cpp
index 60ad94e..0ae07b3 100644
--- a/engines/sword25/gfx/staticbitmap.cpp
+++ b/engines/sword25/gfx/staticbitmap.cpp
@@ -170,7 +170,10 @@ bool StaticBitmap::unpersist(InputPersistenceBlock &reader) {
 	result &= Bitmap::unpersist(reader);
 	Common::String resourceFilename;
 	reader.readString(resourceFilename);
-	result &= initBitmapResource(resourceFilename);
+	// We may not have saves, and we actually do not need to
+	// restore them. So do not even try to load them.
+	if (!resourceFilename.hasPrefix("/saves"))
+		result &= initBitmapResource(resourceFilename);
 
 	result &= RenderObject::unpersistChildren(reader);