[Scummvm-cvs-logs] CVS: residual resource.cc,1.1.1.1,1.2

James Brown ender at users.sourceforge.net
Fri Aug 15 12:16:09 CEST 2003


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

Modified Files:
	resource.cc 
Log Message:
Make error messages when opening files more verbose


Index: resource.cc
===================================================================
RCS file: /cvsroot/scummvm/residual/resource.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- resource.cc	15 Aug 2003 18:00:35 -0000	1.1.1.1
+++ resource.cc	15 Aug 2003 18:53:08 -0000	1.2
@@ -41,14 +41,16 @@
   const char *directory = Registry::instance()->get("DataDir");
   std::string dir_str = (directory != NULL ? directory : ".");
   dir_str += '/';
+  int lab_counter = 0;
+  DIR *d = opendir(dir_str.c_str());
 
   if (directory == NULL) 
     error("Cannot find DataDir registry entry - check configuration file");
 
-  DIR *d = opendir(dir_str.c_str());
   if (d == NULL)
-    return;
+    error("Cannot open DataDir (%s)- check configuration file", dir_str.c_str());
 
+  printf("dir open\n");
   dirent *de;
   while ((de = readdir(d)) != NULL) {
     int namelen = strlen(de->d_name);
@@ -57,6 +59,7 @@
       std::string fullname = dir_str + de->d_name;
 
       Lab *l = new Lab(fullname.c_str());
+      lab_counter++;
       if (l->isOpen())
 	labs_.push_back(l);
       else
@@ -64,6 +67,9 @@
     }
   }
   closedir(d);
+
+  if (lab_counter == 0)
+	error("Cannot find any resource files in %s - check configuration file", dir_str.c_str());
 }
 
 const Lab *ResourceLoader::findFile(const char *filename) const {





More information about the Scummvm-git-logs mailing list