aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/resource.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2010-09-10 14:07:32 +0000
committerFilippos Karapetis2010-09-10 14:07:32 +0000
commit4e27844fef5c631bc92fbd9e0e61da7d1d2bfe86 (patch)
tree7869cb7d3d41c1b078deb1f8987257564804bf93 /engines/sci/resource.cpp
parent8bbbcfe5b8f4c7099d83610c83fe51014e43b6d0 (diff)
downloadscummvm-rg350-4e27844fef5c631bc92fbd9e0e61da7d1d2bfe86.tar.gz
scummvm-rg350-4e27844fef5c631bc92fbd9e0e61da7d1d2bfe86.tar.bz2
scummvm-rg350-4e27844fef5c631bc92fbd9e0e61da7d1d2bfe86.zip
SCI: Some changes regarding resources
- Renamed the debug command "resource_size" to "resource_info", as it now provides the location of where a specified resource is found (i.e. the resource.xxx file, or the file name itself, if the resource is a patch) - "duskdump" shows the original location of dumped resources - loadResource() now shows the location of files that couldn't be loaded svn-id: r52667
Diffstat (limited to 'engines/sci/resource.cpp')
-rw-r--r--engines/sci/resource.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index 46fb0fbf99..2f380d3bba 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -490,8 +490,9 @@ void ResourceSource::loadResource(ResourceManager *resMan, Resource *res) {
int error = res->decompress(resMan->getVolVersion(), fileStream);
if (error) {
- warning("Error %d occurred while reading %s from resource file: %s",
- error, res->_id.toString().c_str(), sci_error_types[error]);
+ warning("Error %d occurred while reading %s from resource file %s: %s",
+ error, res->_id.toString().c_str(), res->getResourceLocation().c_str(),
+ sci_error_types[error]);
res->unalloc();
}
@@ -2353,4 +2354,8 @@ Common::String ResourceManager::findSierraGameId() {
return sierraId;
}
+const Common::String &Resource::getResourceLocation() const {
+ return _source->getLocationName();
+}
+
} // End of namespace Sci