[Scummvm-cvs-logs] CVS: residual resource.cpp,1.1,1.2 grimdialog.htm,1.3,NONE

James Brown ender at users.sourceforge.net
Sat Aug 16 04:19:05 CEST 2003


Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1:/tmp/cvs-serv12545

Modified Files:
	resource.cpp 
Removed Files:
	grimdialog.htm 
Log Message:
Remove grimdialog, workaround bad loadbitmap calls


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/resource.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- resource.cpp	15 Aug 2003 19:41:26 -0000	1.1
+++ resource.cpp	16 Aug 2003 11:10:40 -0000	1.2
@@ -116,8 +116,11 @@
   }
 
   Block *b = getFileBlock(filename);
-  if (b == NULL)
-    error("Could not find bitmap %s\n", filename);
+  if (b == NULL) {	// Grim sometimes asks for non-existant bitmaps (eg, ha_overhead)
+    warning("Could not find bitmap %s\n", filename);
+    return NULL;
+  }
+
   Bitmap *result = new Bitmap(filename, b->data(), b->len());
   delete b;
   cache_[fname] = result;

--- grimdialog.htm DELETED ---





More information about the Scummvm-git-logs mailing list