aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2005-05-23 23:59:20 +0000
committerMax Horn2005-05-23 23:59:20 +0000
commit5b29a41120512adae1e4913ce47df9aaf9440f97 (patch)
treef7308353f445e540db1734d46cc55a3d5abe4cbf /scumm
parent97ff33647dac318aafd657f144b02b8da2ed0057 (diff)
downloadscummvm-rg350-5b29a41120512adae1e4913ce47df9aaf9440f97.tar.gz
scummvm-rg350-5b29a41120512adae1e4913ce47df9aaf9440f97.tar.bz2
scummvm-rg350-5b29a41120512adae1e4913ce47df9aaf9440f97.zip
Must use ScummEngine::openFile(), else you get into troubles with the mac versions of some games
svn-id: r18237
Diffstat (limited to 'scumm')
-rw-r--r--scumm/imuse_digi/dimuse_bndmgr.cpp8
-rw-r--r--scumm/imuse_digi/dimuse_bndmgr.h3
2 files changed, 6 insertions, 5 deletions
diff --git a/scumm/imuse_digi/dimuse_bndmgr.cpp b/scumm/imuse_digi/dimuse_bndmgr.cpp
index 0c618fb812..b076ae0773 100644
--- a/scumm/imuse_digi/dimuse_bndmgr.cpp
+++ b/scumm/imuse_digi/dimuse_bndmgr.cpp
@@ -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;
}
diff --git a/scumm/imuse_digi/dimuse_bndmgr.h b/scumm/imuse_digi/dimuse_bndmgr.h
index be551b2e33..a6c44a6e3e 100644
--- a/scumm/imuse_digi/dimuse_bndmgr.h
+++ b/scumm/imuse_digi/dimuse_bndmgr.h
@@ -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];