Moved ScummFile etc. to the new file.cpp / file.h

svn-id: r21038

engines/scumm/file.h

@@ -0,0 +1,159 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2002-2006 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id: util.h 21036 2006-03-03 14:44:50Z fingolfin $
+ *
+ */
+
+#ifndef SCUMM_FILE_H
+#define SCUMM_FILE_H
+
+#include "common/file.h"
+
+namespace Scumm {
+
+class BaseScummFile : public Common::File {
+public:
+	virtual void setEnc(byte value) = 0;
+
+	virtual bool open(const char *filename, AccessMode mode = kFileReadMode) = 0;
+	virtual bool openSubFile(const char *filename) = 0;
+
+	virtual bool eof() = 0;
+	virtual uint32 pos() = 0;
+	virtual uint32 size() = 0;
+	virtual void seek(int32 offs, int whence = SEEK_SET) = 0;
+	virtual uint32 read(void *dataPtr, uint32 dataSize) = 0;
+	virtual uint32 write(const void *dataPtr, uint32 dataSize) = 0;
+};
+
+class ScummFile : public BaseScummFile {
+private:
+	byte _encbyte;
+	uint32	_subFileStart;
+	uint32	_subFileLen;
+public:
+	ScummFile();
+	void setEnc(byte value);
+
+	void setSubfileRange(uint32 start, uint32 len);
+	void resetSubfile();
+
+	bool open(const char *filename, AccessMode mode = kFileReadMode);
+	bool openSubFile(const char *filename);
+
+	bool eof();
+	uint32 pos();
+	uint32 size();
+	void seek(int32 offs, int whence = SEEK_SET);
+	uint32 read(void *dataPtr, uint32 dataSize);
+	uint32 write(const void *dataPtr, uint32 dataSize);
+};
+
+class ScummNESFile : public BaseScummFile {
+public:
+	enum ROMset {
+		kROMsetUSA,
+		kROMsetEurope,
+		kROMsetSweden,
+		kROMsetFrance,
+		kROMsetGermany,
+		kROMsetNum
+	};
+
+	struct Resource;
+	struct LFLEntry;
+	struct LFL;
+
+private:
+	Common::MemoryReadStream *_stream;
+	ROMset _ROMset;
+	byte *_buf;
+
+	bool generateIndex();
+	bool generateResource(int res);
+	uint16 extractResource(Common::WriteStream *out, Resource *res);
+
+	byte fileReadByte();
+	uint16 fileReadUint16LE();
+
+public:
+	ScummNESFile();
+	void setEnc(byte value);
+
+	bool open(const char *filename, AccessMode mode = kFileReadMode);
+	bool openSubFile(const char *filename);
+
+	void close();
+	bool eof() { return _stream->eos(); }
+	uint32 pos() { return _stream->pos(); }
+	uint32 size() { return _stream->size(); }
+	void seek(int32 offs, int whence = SEEK_SET) { _stream->seek(offs, whence); }
+	uint32 read(void *dataPtr, uint32 dataSize) { return _stream->read(dataPtr, dataSize); }
+	uint32 write(const void *dataPtr, uint32 dataSize);
+};
+
+
+class ScummC64File : public BaseScummFile {
+private:
+	Common::MemoryReadStream *_stream;
+	byte _roomDisks[59], _roomTracks[59], _roomSectors[59];
+
+	byte *_buf;
+
+	bool _maniac;
+	Common::String _disk1, _disk2;
+	int _openedDisk;
+
+	int _numGlobalObjects;
+	int _numRooms;
+	int _numCostumes;
+	int _numScripts;
+	int _numSounds;
+	const int *_resourcesPerFile;
+
+	bool openDisk(char num);
+
+	bool generateIndex();
+	bool generateResource(int res);
+
+	uint16 extractIndex(Common::WriteStream *out);
+	uint16 extractResource(Common::WriteStream *out, int res);
+
+	byte fileReadByte();
+	uint16 fileReadUint16LE();
+
+public:
+	ScummC64File(const char *disk1, const char *disk2, bool maniac);
+	void setEnc(byte value);
+
+	bool open(const char *filename, AccessMode mode = kFileReadMode);
+	bool openSubFile(const char *filename);
+
+	void close();
+	bool eof() { return _stream->eos(); }
+	uint32 pos() { return _stream->pos(); }
+	uint32 size() { return _stream->size(); }
+	void seek(int32 offs, int whence = SEEK_SET) { _stream->seek(offs, whence); }
+	uint32 read(void *dataPtr, uint32 dataSize) { return _stream->read(dataPtr, dataSize); }
+	uint32 write(const void *dataPtr, uint32 dataSize);
+};
+
+} // End of namespace Scumm
+
+#endif

engines/scumm/he/resource_he.cpp

@@ -26,11 +26,12 @@
 
 #include "common/stdafx.h"
 #include "scumm/scumm.h"
+#include "scumm/file.h"
 #include "scumm/he/intern_he.h"
 #include "scumm/resource.h"
 #include "scumm/he/resource_he.h"
 #include "scumm/sound.h"
-#include "scumm/util.h"
+
 #include "sound/wave.h"
 
 #include "common/stream.h"

engines/scumm/he/script_v72he.cpp

@@ -29,6 +29,7 @@
 
 #include "scumm/actor.h"
 #include "scumm/charset.h"
+#include "scumm/file.h"
 #include "scumm/he/intern_he.h"
 #include "scumm/object.h"
 #include "scumm/resource.h"

engines/scumm/he/script_v80he.cpp

@@ -35,7 +35,6 @@
 #include "scumm/he/resource_he.h"
 #include "scumm/scumm.h"
 #include "scumm/sound.h"
-#include "scumm/util.h"
 
 namespace Scumm {
 

engines/scumm/he/sound_he.cpp

@@ -23,6 +23,7 @@
 
 #include "common/stdafx.h"
 #include "scumm/actor.h"
+#include "scumm/file.h"
 #include "scumm/imuse/imuse.h"
 #include "scumm/scumm.h"
 #include "scumm/sound.h"

engines/scumm/imuse_digi/dimuse_bndmgr.cpp

@@ -23,6 +23,7 @@
 #include "common/scummsys.h"
 #include "scumm/scumm.h"
 #include "scumm/util.h"
+#include "scumm/file.h"
 #include "scumm/imuse_digi/dimuse_bndmgr.h"
 
 namespace Scumm {

engines/scumm/insane/insane.cpp

@@ -29,6 +29,7 @@
 
 #include "scumm/scumm.h"
 #include "scumm/actor.h"
+#include "scumm/file.h"
 #include "scumm/sound.h"
 
 #include "scumm/imuse/imuse.h"

engines/scumm/module.mk

@@ -12,6 +12,7 @@ MODULE_OBJS := \
 	cursor.o \
 	debugger.o \
 	dialogs.o \
+	file.o \
 	gfx.o \
 	he/script_v60he.o \
 	he/sound_he.o \

engines/scumm/nut_renderer.cpp

@@ -21,6 +21,7 @@
 
 #include "common/stdafx.h"
 #include "scumm/scumm.h"
+#include "scumm/file.h"
 #include "scumm/nut_renderer.h"
 #include "scumm/util.h"
 

engines/scumm/resource.cpp

@@ -26,6 +26,7 @@
 
 #include "scumm/charset.h"
 #include "scumm/dialogs.h"
+#include "scumm/file.h"
 #include "scumm/imuse/imuse.h"
 #include "scumm/imuse_digi/dimuse.h"
 #include "scumm/intern.h"

engines/scumm/resource_v2.cpp

@@ -22,10 +22,10 @@
 
 #include "common/stdafx.h"
 
+#include "scumm/file.h"
 #include "scumm/scumm.h"
 #include "scumm/intern.h"
 #include "scumm/resource.h"
-#include "scumm/util.h"
 
 namespace Scumm {
 

engines/scumm/resource_v3.cpp

@@ -24,6 +24,7 @@
 #include "common/stdafx.h"
 #include "scumm/scumm.h"
 #include "scumm/intern.h"
+#include "scumm/file.h"
 #include "scumm/util.h"
 
 namespace Scumm {

engines/scumm/resource_v4.cpp

@@ -24,6 +24,7 @@
 #include "common/stdafx.h"
 #include "scumm/scumm.h"
 #include "scumm/intern.h"
+#include "scumm/file.h"
 #include "scumm/resource.h"
 #include "scumm/util.h"
 

engines/scumm/script_c64.cpp

@@ -27,7 +27,6 @@
 #include "scumm/intern.h"
 #include "scumm/object.h"
 #include "scumm/scumm.h"
-#include "scumm/util.h"
 #include "scumm/verbs.h"
 
 namespace Scumm {

engines/scumm/script_v6.cpp

@@ -27,6 +27,7 @@
 
 #include "scumm/actor.h"
 #include "scumm/charset.h"
+#include "scumm/file.h"
 #include "scumm/imuse/imuse.h"
 #include "scumm/imuse_digi/dimuse.h"
 #include "scumm/insane/insane.h"

engines/scumm/script_v8.cpp

@@ -23,17 +23,21 @@
 #include "common/stdafx.h"
 #include "common/config-manager.h"
 #include "common/system.h"
+
 #include "scumm/actor.h"
 #include "scumm/akos.h"
 #include "scumm/charset.h"
+#include "scumm/file.h"
 #include "scumm/imuse_digi/dimuse.h"
 #include "scumm/intern.h"
 #include "scumm/object.h"
 #include "scumm/resource.h"
 #include "scumm/scumm.h"
 #include "scumm/sound.h"
+#include "scumm/util.h"
 #include "scumm/verbs.h"
 #include "scumm/smush/smush_player.h"
+
 #include "sound/mixer.h"
 
 namespace Scumm {

engines/scumm/scumm.cpp

@@ -40,6 +40,7 @@
 #include "scumm/costume.h"
 #include "scumm/debugger.h"
 #include "scumm/dialogs.h"
+#include "scumm/file.h"
 #include "scumm/imuse/imuse.h"
 #include "scumm/imuse_digi/dimuse.h"
 #include "scumm/insane/insane.h"

engines/scumm/smush/chunk.cpp

@@ -23,6 +23,7 @@
 #include "common/stdafx.h"
 #include "scumm/smush/chunk.h"
 #include "scumm/scumm.h"
+#include "scumm/file.h"
 
 #include "common/file.h"
 #include "common/str.h"

engines/scumm/smush/chunk.h

@@ -25,7 +25,6 @@
 
 #include "common/scummsys.h"
 #include "common/str.h"
-#include "scumm/util.h"
 
 namespace Scumm {
 

engines/scumm/smush/smush_player.cpp

@@ -31,6 +31,7 @@
 #include "common/util.h"
 
 #include "scumm/bomp.h"
+#include "scumm/file.h"
 #include "scumm/imuse_digi/dimuse.h"
 #include "scumm/imuse/imuse.h"
 #include "scumm/scumm.h"

engines/scumm/sound.cpp

@@ -23,6 +23,7 @@
 
 #include "common/stdafx.h"
 #include "scumm/actor.h"
+#include "scumm/file.h"
 #include "scumm/imuse/imuse.h"
 #include "scumm/imuse_digi/dimuse.h"
 #include "scumm/scumm.h"

engines/scumm/string.cpp

@@ -29,6 +29,7 @@
 #include "scumm/actor.h"
 #include "scumm/charset.h"
 #include "scumm/dialogs.h"
+#include "scumm/file.h"
 #include "scumm/imuse_digi/dimuse.h"
 #include "scumm/intern.h"
 #ifndef DISABLE_HE
@@ -36,7 +37,6 @@
 #endif
 #include "scumm/verbs.h"
 #include "scumm/sound.h"
-#include "scumm/util.h"
 
 namespace Scumm {
 

engines/scumm/util.h

@@ -23,141 +23,13 @@
 #ifndef SCUMM_UTIL_H
 #define SCUMM_UTIL_H
 
-#include "common/file.h"
+#include "common/stdafx.h"
-#include "common/stream.h"
+#include "common/scummsys.h"
 
 namespace Scumm {
 
 #define revBitMask(x)	(0x80 >> (x))
 
-class BaseScummFile : public Common::File {
-public:
-	virtual void setEnc(byte value) = 0;
-
-	virtual bool open(const char *filename, AccessMode mode = kFileReadMode) = 0;
-	virtual bool openSubFile(const char *filename) = 0;
-
-	virtual bool eof() = 0;
-	virtual uint32 pos() = 0;
-	virtual uint32 size() = 0;
-	virtual void seek(int32 offs, int whence = SEEK_SET) = 0;
-	virtual uint32 read(void *dataPtr, uint32 dataSize) = 0;
-	virtual uint32 write(const void *dataPtr, uint32 dataSize) = 0;
-};
-
-class ScummFile : public BaseScummFile {
-private:
-	byte _encbyte;
-	uint32	_subFileStart;
-	uint32	_subFileLen;
-public:
-	ScummFile();
-	void setEnc(byte value);
-
-	void setSubfileRange(uint32 start, uint32 len);
-	void resetSubfile();
-
-	bool open(const char *filename, AccessMode mode = kFileReadMode);
-	bool openSubFile(const char *filename);
-
-	bool eof();
-	uint32 pos();
-	uint32 size();
-	void seek(int32 offs, int whence = SEEK_SET);
-	uint32 read(void *dataPtr, uint32 dataSize);
-	uint32 write(const void *dataPtr, uint32 dataSize);
-};
-
-class ScummNESFile : public BaseScummFile {
-public:
-	enum ROMset {
-		kROMsetUSA,
-		kROMsetEurope,
-		kROMsetSweden,
-		kROMsetFrance,
-		kROMsetGermany,
-		kROMsetNum
-	};
-
-	struct Resource;
-	struct LFLEntry;
-	struct LFL;
-
-private:
-	Common::MemoryReadStream *_stream;
-	ROMset _ROMset;
-	byte *_buf;
-
-	bool generateIndex();
-	bool generateResource(int res);
-	uint16 extractResource(Common::WriteStream *out, Resource *res);
-
-	byte fileReadByte();
-	uint16 fileReadUint16LE();
-
-public:
-	ScummNESFile();
-	void setEnc(byte value);
-
-	bool open(const char *filename, AccessMode mode = kFileReadMode);
-	bool openSubFile(const char *filename);
-
-	void close();
-	bool eof() { return _stream->eos(); }
-	uint32 pos() { return _stream->pos(); }
-	uint32 size() { return _stream->size(); }
-	void seek(int32 offs, int whence = SEEK_SET) { _stream->seek(offs, whence); }
-	uint32 read(void *dataPtr, uint32 dataSize) { return _stream->read(dataPtr, dataSize); }
-	uint32 write(const void *dataPtr, uint32 dataSize);
-};
-
-
-class ScummC64File : public BaseScummFile {
-private:
-	Common::MemoryReadStream *_stream;
-	byte _roomDisks[59], _roomTracks[59], _roomSectors[59];
-
-	byte *_buf;
-
-	bool _maniac;
-	Common::String _disk1, _disk2;
-	int _openedDisk;
-
-	int _numGlobalObjects;
-	int _numRooms;
-	int _numCostumes;
-	int _numScripts;
-	int _numSounds;
-	const int *_resourcesPerFile;
-
-	bool openDisk(char num);
-
-	bool generateIndex();
-	bool generateResource(int res);
-
-	uint16 extractIndex(Common::WriteStream *out);
-	uint16 extractResource(Common::WriteStream *out, int res);
-
-	byte fileReadByte();
-	uint16 fileReadUint16LE();
-
-public:
-	ScummC64File(const char *disk1, const char *disk2, bool maniac);
-	void setEnc(byte value);
-
-	bool open(const char *filename, AccessMode mode = kFileReadMode);
-	bool openSubFile(const char *filename);
-
-	void close();
-	bool eof() { return _stream->eos(); }
-	uint32 pos() { return _stream->pos(); }
-	uint32 size() { return _stream->size(); }
-	void seek(int32 offs, int whence = SEEK_SET) { _stream->seek(offs, whence); }
-	uint32 read(void *dataPtr, uint32 dataSize) { return _stream->read(dataPtr, dataSize); }
-	uint32 write(const void *dataPtr, uint32 dataSize);
-};
-
-
 /* Direction conversion functions (between old dir and new dir format) */
 int newDirToOldDir(int dir);
 int oldDirToNewDir(int dir);