Load SMUSH files and NUT fonts from mac container files, too (done that by adding a new high level method openFile to class ScummEngine)

svn-id: r14346

3 files changed, 8 insertions, 7 deletions

diff --git a/scumm/smush/chunk.cpp b/scumm/smush/chunk.cpp
index 8df68c1b15..181d7707c4 100644
--- a/scumm/smush/chunk.cpp
+++ b/scumm/smush/chunk.cpp
@@ -21,6 +21,7 @@
 
 #include "stdafx.h"
 #include "scumm/smush/chunk.h"
+#include "scumm/scumm.h"
 
 #include "common/file.h"
 #include "common/str.h"
@@ -89,8 +90,8 @@ FileChunk::FileChunk() :
 }
 
 FileChunk::FileChunk(const char *fname) {
-	_data = new File();
-	if (!_data->open(fname))
+	_data = new ScummFile();
+	if (!g_scumm->openFile(*_data, fname))
 		error("FileChunk: Unable to open file %s", fname);
 
 	_type = _data->readUint32BE();
diff --git a/scumm/smush/chunk.h b/scumm/smush/chunk.h
index 3419d536a3..63453103b2 100644
--- a/scumm/smush/chunk.h
+++ b/scumm/smush/chunk.h
@@ -24,10 +24,10 @@
 
 #include "common/scummsys.h"
 
-class File;
-
 namespace Scumm {
 
+class ScummFile;
+
 class Chunk {
 public:
 	virtual ~Chunk() {};
@@ -67,7 +67,7 @@ public:
 
 class FileChunk : public BaseChunk {
 private:
-	File *_data;
+	ScummFile *_data;
 	uint32 _offset;
 
 protected:
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp
index 2950c150c0..8583151774 100644
--- a/scumm/smush/smush_player.cpp
+++ b/scumm/smush/smush_player.cpp
@@ -1116,8 +1116,8 @@ void SmushPlayer::seekSan(const char *file, int32 pos, int32 contFrame) {
 void SmushPlayer::play(const char *filename, int32 offset, int32 startFrame) {
 
 	// Verify the specified file exists
-	File f;
-	f.open(filename);
+	ScummFile f;
+	_vm->openFile(f, filename);
 	if (!f.isOpen()) {
 		warning("SmushPlayer::play() File not found %s", filename);
 		return;