mirror of
https://github.com/libretro/scummvm.git
synced 2025-03-02 00:07:59 +00:00
Must use ScummEngine::openFile(), else you get into troubles with the mac versions of some games
svn-id: r18237
This commit is contained in:
parent
97ff33647d
commit
5b29a41120
scumm/imuse_digi
@ -71,9 +71,9 @@ int BundleDirCache::matchFile(const char *filename) {
|
||||
}
|
||||
|
||||
if (!found) {
|
||||
Common::File file;
|
||||
ScummFile file;
|
||||
|
||||
if (file.open(filename) == false) {
|
||||
if (g_scumm->openFile(file, filename) == false) {
|
||||
error("BundleDirCache::matchFile() Can't open bundle file: %s", filename);
|
||||
return false;
|
||||
}
|
||||
@ -152,8 +152,8 @@ bool BundleMgr::open(const char *filename, bool &compressed) {
|
||||
if (_file.isOpen())
|
||||
return true;
|
||||
|
||||
if (_file.open(filename) == false) {
|
||||
error("BundleMgr::openFile() Can't open bundle file: %s", filename);
|
||||
if (g_scumm->openFile(_file, filename) == false) {
|
||||
error("BundleMgr::open() Can't open bundle file: %s", filename);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -23,6 +23,7 @@
|
||||
|
||||
#include "common/scummsys.h"
|
||||
#include "common/file.h"
|
||||
#include "scumm/util.h"
|
||||
|
||||
namespace Scumm {
|
||||
|
||||
@ -67,7 +68,7 @@ private:
|
||||
int _numFiles;
|
||||
int _numCompItems;
|
||||
int _curSample;
|
||||
Common::File _file;
|
||||
ScummFile _file;
|
||||
bool _compTableLoaded;
|
||||
int _fileBundleId;
|
||||
byte _compOutput[0x2000];
|
||||
|
Loading…
x
Reference in New Issue
Block a user