[Scummvm-cvs-logs] CVS: scummvm/scumm/smush chunk.cpp,1.28,1.29 chunk.h,1.15,1.16 smush_player.cpp,1.127,1.128
Max Horn
fingolfin at users.sourceforge.net
Mon Jul 26 16:16:06 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm/insane insane.cpp,1.30,1.31
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm nut_renderer.cpp,1.48,1.49 resource.cpp,1.231,1.232 scumm.h,1.433,1.434 sound.cpp,1.358,1.359 sound.h,1.70,1.71 string.cpp,1.229,1.230
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27289/smush
Modified Files:
chunk.cpp chunk.h smush_player.cpp
Log Message:
Load SMUSH files and NUT fonts from mac container files, too (done that by adding a new high level method openFile to class ScummEngine)
Index: chunk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/chunk.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- chunk.cpp 28 Jun 2004 22:34:22 -0000 1.28
+++ chunk.cpp 26 Jul 2004 23:15:01 -0000 1.29
@@ -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(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();
Index: chunk.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/chunk.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- chunk.h 28 Jun 2004 22:34:22 -0000 1.15
+++ chunk.h 26 Jul 2004 23:15:01 -0000 1.16
@@ -24,10 +24,10 @@
#include "common/scummsys.h"
-class File;
-
namespace Scumm {
+class ScummFile;
+
class Chunk {
public:
virtual ~Chunk() {};
@@ -67,7 +67,7 @@
class FileChunk : public BaseChunk {
private:
- File *_data;
+ ScummFile *_data;
uint32 _offset;
protected:
Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- smush_player.cpp 27 Jun 2004 21:52:25 -0000 1.127
+++ smush_player.cpp 26 Jul 2004 23:15:01 -0000 1.128
@@ -1116,8 +1116,8 @@
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;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm/insane insane.cpp,1.30,1.31
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm nut_renderer.cpp,1.48,1.49 resource.cpp,1.231,1.232 scumm.h,1.433,1.434 sound.cpp,1.358,1.359 sound.h,1.70,1.71 string.cpp,1.229,1.230
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list