[Scummvm-cvs-logs] SF.net SVN: scummvm:[55667] scummvm/trunk/engines/sword25/gfx

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Sun Jan 30 22:00:24 CET 2011


Revision: 55667
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55667&view=rev
Author:   thebluegr
Date:     2011-01-30 21:00:23 +0000 (Sun, 30 Jan 2011)

Log Message:
-----------
SWORD25: Disabled the video save/load code, and made it error out instead.

Videos are never saved or loaded, thus when this happens, it probably indicates a game bug
or a corrupted saved game

Modified Paths:
--------------
    scummvm/trunk/engines/sword25/gfx/dynamicbitmap.cpp
    scummvm/trunk/engines/sword25/gfx/renderobject.cpp

Modified: scummvm/trunk/engines/sword25/gfx/dynamicbitmap.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/dynamicbitmap.cpp	2011-01-30 20:39:02 UTC (rev 55666)
+++ scummvm/trunk/engines/sword25/gfx/dynamicbitmap.cpp	2011-01-30 21:00:23 UTC (rev 55667)
@@ -133,6 +133,7 @@
 }
 
 bool DynamicBitmap::persist(OutputPersistenceBlock &writer) {
+#if 0
 	bool result = true;
 
 	result &= Bitmap::persist(writer);
@@ -144,9 +145,15 @@
 	result &= RenderObject::persistChildren(writer);
 
 	return result;
+#endif
+
+	error("Request to persist a dynamic bitmap (video) - probably a bug");
+
+	return true;
 }
 
 bool DynamicBitmap::unpersist(InputPersistenceBlock &reader) {
+#if 0
 	bool result = true;
 
 	result &= Bitmap::unpersist(reader);
@@ -162,6 +169,9 @@
 	result &= RenderObject::unpersistChildren(reader);
 
 	return reader.isGood() && result;
+#endif
+
+	error("Request to unpersist a dynamic bitmap (video) - probably a corrupted saved game or a bug");
 }
 
 } // End of namespace Sword25

Modified: scummvm/trunk/engines/sword25/gfx/renderobject.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/renderobject.cpp	2011-01-30 20:39:02 UTC (rev 55666)
+++ scummvm/trunk/engines/sword25/gfx/renderobject.cpp	2011-01-30 21:00:23 UTC (rev 55667)
@@ -486,7 +486,9 @@
 		break;
 
 	case TYPE_DYNAMICBITMAP:
-		result = (new DynamicBitmap(reader, this->getHandle(), handle))->getHandle();
+		// Videos are not normally saved: this probably indicates a bug, thus die here.
+		//result = (new DynamicBitmap(reader, this->getHandle(), handle))->getHandle();
+		error("Request to recreate a video. This is either a corrupted saved game, or a bug");
 		break;
 
 	case TYPE_TEXT:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list