[Scummvm-cvs-logs] scummvm branch-1-4 -> 7ec7cb92b87ae361095248983a907a1fcd438904

digitall digitall at scummvm.org
Mon Nov 14 00:59:34 CET 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7ec7cb92b8 AGOS: Fix engine crash when playing Feeble Files from cabinet datafiles.


Commit: 7ec7cb92b87ae361095248983a907a1fcd438904
    https://github.com/scummvm/scummvm/commit/7ec7cb92b87ae361095248983a907a1fcd438904
Author: D G Turner (digitall at scummvm.org)
Date: 2011-11-13T15:56:59-08:00

Commit Message:
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.

Changed paths:
    engines/agos/agos.h
    engines/agos/animation.cpp
    engines/agos/installshield_cab.cpp
    engines/agos/res.cpp








More information about the Scummvm-git-logs mailing list