[Scummvm-cvs-logs] SF.net SVN: scummvm: [28126] scummvm/trunk/engines/saga/rscfile.cpp
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Tue Jul 17 20:04:31 CEST 2007
Revision: 28126
http://scummvm.svn.sourceforge.net/scummvm/?rev=28126&view=rev
Author: thebluegr
Date: 2007-07-17 11:04:30 -0700 (Tue, 17 Jul 2007)
Log Message:
-----------
Possible fix for bug 1754613. It's now possible to have an uncompressed music.rsc file when the rest of the data files are compressed
Modified Paths:
--------------
scummvm/trunk/engines/saga/rscfile.cpp
Modified: scummvm/trunk/engines/saga/rscfile.cpp
===================================================================
--- scummvm/trunk/engines/saga/rscfile.cpp 2007-07-16 22:55:44 UTC (rev 28125)
+++ scummvm/trunk/engines/saga/rscfile.cpp 2007-07-17 18:04:30 UTC (rev 28126)
@@ -427,14 +427,14 @@
if (Common::File::exists("music.rsc") || Common::File::exists("music.cmp")) {
_contextsCount++;
digitalMusic = true;
- if (_vm->getFeatures() & GF_COMPRESSED_SOUNDS)
+ if (Common::File::exists("music.cmp"))
sprintf(musicFileName, "music.cmp");
else
sprintf(musicFileName, "music.rsc");
} else if (Common::File::exists("musicd.rsc") || Common::File::exists("musicd.cmp")) {
_contextsCount++;
digitalMusic = true;
- if (_vm->getFeatures() & GF_COMPRESSED_SOUNDS)
+ if (Common::File::exists("musicd.rsc"))
sprintf(musicFileName, "musicd.cmp");
else
sprintf(musicFileName, "musicd.rsc");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list