[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_bndmgr.cpp,1.33,1.34 dimuse_bndmgr.h,1.15,1.16
Max Horn
fingolfin at users.sourceforge.net
Mon May 23 17:01:06 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.362,1.363
- Next message: [Scummvm-cvs-logs] CVS: docs/docbook credits.xml,1.11,1.12 faq.pdf,1.4,1.5 manual.html,1.18,1.19 manual.pdf,1.18,1.19 manual.txt,1.17,1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29642
Modified Files:
dimuse_bndmgr.cpp dimuse_bndmgr.h
Log Message:
Must use ScummEngine::openFile(), else you get into troubles with the mac versions of some games
Index: dimuse_bndmgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_bndmgr.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- dimuse_bndmgr.cpp 21 May 2005 11:13:46 -0000 1.33
+++ dimuse_bndmgr.cpp 23 May 2005 23:59:19 -0000 1.34
@@ -71,9 +71,9 @@
}
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 @@
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;
}
Index: dimuse_bndmgr.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_bndmgr.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- dimuse_bndmgr.h 10 May 2005 22:56:14 -0000 1.15
+++ dimuse_bndmgr.h 23 May 2005 23:59:20 -0000 1.16
@@ -23,6 +23,7 @@
#include "common/scummsys.h"
#include "common/file.h"
+#include "scumm/util.h"
namespace Scumm {
@@ -67,7 +68,7 @@
int _numFiles;
int _numCompItems;
int _curSample;
- Common::File _file;
+ ScummFile _file;
bool _compTableLoaded;
int _fileBundleId;
byte _compOutput[0x2000];
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.362,1.363
- Next message: [Scummvm-cvs-logs] CVS: docs/docbook credits.xml,1.11,1.12 faq.pdf,1.4,1.5 manual.html,1.18,1.19 manual.pdf,1.18,1.19 manual.txt,1.17,1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list