[Scummvm-cvs-logs] CVS: scummvm/scumm util.h,2.4,2.5

Pawel Kolodziejski aquadran at users.sourceforge.net
Sun Apr 3 23:10:05 CEST 2005


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19648

Modified Files:
	util.h 
Log Message:
fixed compilation

Index: util.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/util.h,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -d -r2.4 -r2.5
--- util.h	30 Mar 2005 21:59:12 -0000	2.4
+++ util.h	4 Apr 2005 06:09:04 -0000	2.5
@@ -83,6 +83,7 @@
 } res_type;
 
 class ScummNESFile : public BaseScummFile {
+public:
 	typedef	enum _romset {
 		kROMsetUSA,
 		kROMsetEurope,
@@ -91,8 +92,6 @@
 		kROMsetNum 
 	} t_romset;
 
-public:
-
 	typedef	struct	_resource {
 		uint32 offset[kROMsetNum];
 		uint16 length[kROMsetNum];
@@ -125,7 +124,7 @@
 	bool eof() { return _stream->eof(); }
 	uint32 pos() { return _stream->pos(); }
 	uint32 size() { return _stream->size(); }
-	void seek(int32 offs, int whence = SEEK_SET) { return _stream->seek(offs, whence); }
+	void seek(int32 offs, int whence = SEEK_SET) { _stream->seek(offs, whence); }
 	uint32 read(void *ptr, uint32 len) { return _stream->read(ptr, len); }
 	uint32 write(const void *ptr, uint32 size);
 };





More information about the Scummvm-git-logs mailing list