aboutsummaryrefslogtreecommitdiff
path: root/engines/agos/installshield_cab.cpp
diff options
context:
space:
mode:
authorD G Turner2011-11-13 23:35:02 +0000
committerD G Turner2011-11-13 23:44:38 +0000
commit783e3fea628d32a7286ee1810ee720eea2a8ea78 (patch)
tree78212960ca1ede89338cf85a3bcd88e31488e3cd /engines/agos/installshield_cab.cpp
parent4b433c296118cddc8811f1c5a34a9453bad253d0 (diff)
downloadscummvm-rg350-783e3fea628d32a7286ee1810ee720eea2a8ea78.tar.gz
scummvm-rg350-783e3fea628d32a7286ee1810ee720eea2a8ea78.tar.bz2
scummvm-rg350-783e3fea628d32a7286ee1810ee720eea2a8ea78.zip
AGOS: Fix engine crash when playing Feeble Files from cabinet datafiles.
Playing with cabinet datafiles, this failed to find the "Charisma.smk" file in the cabinets when in the Recreation (TV) room on Cygnus Alpha and this caused an engine abort after the GUI dialog warning of the "missing" video file. This was due to animation.cpp code using Common::file::exists() instead of going via the ArchiveMan. However,a hasFile() method implementation was also required to implement fallback to decompressed (movie) files if the file requested is not in the cabinet or the cabinet has been externally decompressed to files. Thanks to fuzzie for the hasFile() patch. Also, removed noisy warning which this correction triggers repeatedly in installshield_cab.cpp hasFile(). This looks like leftover from debugging, so not critical.
Diffstat (limited to 'engines/agos/installshield_cab.cpp')
-rw-r--r--engines/agos/installshield_cab.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/engines/agos/installshield_cab.cpp b/engines/agos/installshield_cab.cpp
index f7b49a64c5..ac4e40d1d1 100644
--- a/engines/agos/installshield_cab.cpp
+++ b/engines/agos/installshield_cab.cpp
@@ -162,7 +162,6 @@ InstallShieldCabinet::InstallShieldCabinet(const Common::String &filename) : _in
}
bool InstallShieldCabinet::hasFile(const Common::String &name) {
- warning("hasFile: Filename %s", name.c_str());
return _map.contains(name);
}