[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
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/backends/midi adlib.cpp,1.45,1.46
- Next message: [Scummvm-cvs-logs] CVS: residual actor.cpp,NONE,1.1 actor.h,NONE,1.1 bitmap.cpp,NONE,1.1 bitmap.h,NONE,1.1 bits.h,NONE,1.1 color.h,NONE,1.1 colormap.h,NONE,1.1 costume.cpp,NONE,1.1 costume.h,NONE,1.1 debug.cpp,NONE,1.1 debug.h,NONE,1.1 engine.cpp,NONE,1.1 engine.h,NONE,1.1 hash_map.h,NONE,1.1 keyframe.cpp,NONE,1.1 keyframe.h,NONE,1.1 lab.cpp,NONE,1.1 lab.h,NONE,1.1 localize.cpp,NONE,1.1 localize.h,NONE,1.1 lua.cpp,NONE,1.1 lua.h,NONE,1.1 main.cpp,NONE,1.1 material.cpp,NONE,1.1 material.h,NONE,1.1 mixer.cpp,NONE,1.1 mixer.h,NONE,1.1 model.cpp,NONE,1.1 model.h,NONE,1.1 registry.cpp,NONE,1.1 registry.h,NONE,1.1 resource.cpp,NONE,1.1 resource.h,NONE,1.1 scene.cpp,NONE,1.1 scene.h,NONE,1.1 sound.cpp,NONE,1.1 sound.h,NONE,1.1 textsplit.cpp,NONE,1.1 textsplit.h,NONE,1.1 vector3d.h,NONE,1.1 grimdialog.htm,1.1.1.1,1.2 actor.cc,1.1.1.1,NONE actor.hh,1.1.1.1,NONE bitmap.cc,1.1.1.1,NONE bitmap.hh,1.1.1.1,NONE bits.hh,1.1.1.1,NONE color.hh,1.1.1.1,NONE colormap.hh,1.1.1.1,NONE costume.cc,1.1.1.1,NONE costume.hh,1.1.1.1,NONE debug.cc,1.1.1.1,NONE debug.hh,1.1.1.1,NONE engine.cc,1.1.1.1,NONE engine.hh,1.1.1.1,NONE hash_map.hh,1.1.1.1,NONE keyframe.cc,1.1.1.1,NONE keyframe.hh,1.1.1.1,NONE lab.cc,1.1.1.1,NONE lab.hh,1.1.1.1,NONE localize.cc,1.1.1.1,NONE localize.hh,1.1.1.1,NONE lua.cc,1.1.1.1,NONE lua.hh,1.1.1.1,NONE main.cc,1.1.1.1,NONE material.cc,1.1.1.1,NONE material.hh,1.1.1.1,NONE mixer.cc,1.1.1.1,NONE mixer.hh,1.1.1.1,NONE model.cc,1.1.1.1,NONE model.hh,1.1.1.1,NONE registry.cc,1.1.1.1,NONE registry.hh,1.1.1.1,NONE resource.cc,1.2,NONE resource.hh,1.1.1.1,NONE scene.cc,1.1.1.1,NONE scene.hh,1.1.1.1,NONE sound.cc,1.1.1.1,NONE sound.hh,1.1.1.1,NONE textsplit.cc,1.1.1.1,NONE textsplit.hh,1.1.1.1,NONE vector3d.hh,1.1.1.1,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
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 {
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/backends/midi adlib.cpp,1.45,1.46
- Next message: [Scummvm-cvs-logs] CVS: residual actor.cpp,NONE,1.1 actor.h,NONE,1.1 bitmap.cpp,NONE,1.1 bitmap.h,NONE,1.1 bits.h,NONE,1.1 color.h,NONE,1.1 colormap.h,NONE,1.1 costume.cpp,NONE,1.1 costume.h,NONE,1.1 debug.cpp,NONE,1.1 debug.h,NONE,1.1 engine.cpp,NONE,1.1 engine.h,NONE,1.1 hash_map.h,NONE,1.1 keyframe.cpp,NONE,1.1 keyframe.h,NONE,1.1 lab.cpp,NONE,1.1 lab.h,NONE,1.1 localize.cpp,NONE,1.1 localize.h,NONE,1.1 lua.cpp,NONE,1.1 lua.h,NONE,1.1 main.cpp,NONE,1.1 material.cpp,NONE,1.1 material.h,NONE,1.1 mixer.cpp,NONE,1.1 mixer.h,NONE,1.1 model.cpp,NONE,1.1 model.h,NONE,1.1 registry.cpp,NONE,1.1 registry.h,NONE,1.1 resource.cpp,NONE,1.1 resource.h,NONE,1.1 scene.cpp,NONE,1.1 scene.h,NONE,1.1 sound.cpp,NONE,1.1 sound.h,NONE,1.1 textsplit.cpp,NONE,1.1 textsplit.h,NONE,1.1 vector3d.h,NONE,1.1 grimdialog.htm,1.1.1.1,1.2 actor.cc,1.1.1.1,NONE actor.hh,1.1.1.1,NONE bitmap.cc,1.1.1.1,NONE bitmap.hh,1.1.1.1,NONE bits.hh,1.1.1.1,NONE color.hh,1.1.1.1,NONE colormap.hh,1.1.1.1,NONE costume.cc,1.1.1.1,NONE costume.hh,1.1.1.1,NONE debug.cc,1.1.1.1,NONE debug.hh,1.1.1.1,NONE engine.cc,1.1.1.1,NONE engine.hh,1.1.1.1,NONE hash_map.hh,1.1.1.1,NONE keyframe.cc,1.1.1.1,NONE keyframe.hh,1.1.1.1,NONE lab.cc,1.1.1.1,NONE lab.hh,1.1.1.1,NONE localize.cc,1.1.1.1,NONE localize.hh,1.1.1.1,NONE lua.cc,1.1.1.1,NONE lua.hh,1.1.1.1,NONE main.cc,1.1.1.1,NONE material.cc,1.1.1.1,NONE material.hh,1.1.1.1,NONE mixer.cc,1.1.1.1,NONE mixer.hh,1.1.1.1,NONE model.cc,1.1.1.1,NONE model.hh,1.1.1.1,NONE registry.cc,1.1.1.1,NONE registry.hh,1.1.1.1,NONE resource.cc,1.2,NONE resource.hh,1.1.1.1,NONE scene.cc,1.1.1.1,NONE scene.hh,1.1.1.1,NONE sound.cc,1.1.1.1,NONE sound.hh,1.1.1.1,NONE textsplit.cc,1.1.1.1,NONE textsplit.hh,1.1.1.1,NONE vector3d.hh,1.1.1.1,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list