aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Kołodziejski2005-04-04 06:09:04 +0000
committerPaweł Kołodziejski2005-04-04 06:09:04 +0000
commitc7ddbf7cad4b106d71499bdf925782ca69375bc9 (patch)
tree7e5b551ab5cad78ed77e04aa97335ba308fa867b
parentcab1ac3016701a04fe5c818bd32028791c9ac660 (diff)
downloadscummvm-rg350-c7ddbf7cad4b106d71499bdf925782ca69375bc9.tar.gz
scummvm-rg350-c7ddbf7cad4b106d71499bdf925782ca69375bc9.tar.bz2
scummvm-rg350-c7ddbf7cad4b106d71499bdf925782ca69375bc9.zip
fixed compilation
svn-id: r17370
-rw-r--r--scumm/util.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/scumm/util.h b/scumm/util.h
index d61a4d3d18..873966eca7 100644
--- a/scumm/util.h
+++ b/scumm/util.h
@@ -83,6 +83,7 @@ typedef enum _res_type {
} res_type;
class ScummNESFile : public BaseScummFile {
+public:
typedef enum _romset {
kROMsetUSA,
kROMsetEurope,
@@ -91,8 +92,6 @@ class ScummNESFile : public BaseScummFile {
kROMsetNum
} t_romset;
-public:
-
typedef struct _resource {
uint32 offset[kROMsetNum];
uint16 length[kROMsetNum];
@@ -125,7 +124,7 @@ public:
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);
};