diff options
author | Max Horn | 2005-04-10 12:59:17 +0000 |
---|---|---|
committer | Max Horn | 2005-04-10 12:59:17 +0000 |
commit | 871e278f8be3fc4b27fadca50922dd2193dbd409 (patch) | |
tree | cf9be444f841cf731d1f0748cc1a97dceda4d32b /scumm/util.h | |
parent | e3fbf090350f6a967cc04d9804dbb4ed64e7a1af (diff) | |
download | scummvm-rg350-871e278f8be3fc4b27fadca50922dd2193dbd409.tar.gz scummvm-rg350-871e278f8be3fc4b27fadca50922dd2193dbd409.tar.bz2 scummvm-rg350-871e278f8be3fc4b27fadca50922dd2193dbd409.zip |
Reduce dependencies on scumm/util.h; modified ScummNESFile a bit so that it complies a bit better with our code formatting rules
svn-id: r17508
Diffstat (limited to 'scumm/util.h')
-rw-r--r-- | scumm/util.h | 40 |
1 files changed, 9 insertions, 31 deletions
diff --git a/scumm/util.h b/scumm/util.h index 5863a47587..48821755b1 100644 --- a/scumm/util.h +++ b/scumm/util.h @@ -65,54 +65,32 @@ public: uint32 write(const void *ptr, uint32 size); }; -typedef enum _res_type { - NES_UNKNOWN, - NES_GLOBDATA, - NES_ROOM, - NES_SCRIPT, - NES_SOUND, - NES_COSTUME, - NES_ROOMGFX, - NES_COSTUMEGFX, - NES_SPRPALS, - NES_SPRDESC, - NES_SPRLENS, - NES_SPROFFS, - NES_SPRDATA, - NES_CHARSET, - NES_PREPLIST -} res_type; - class ScummNESFile : public BaseScummFile { public: - typedef enum _romset { + enum ROMset { kROMsetUSA, kROMsetEurope, kROMsetSweden, kROMsetFrance, kROMsetNum - } t_romset; + }; - typedef struct _resource { - uint32 offset[kROMsetNum]; - uint16 length[kROMsetNum]; - res_type type; - } t_resource, *p_resource; + struct Resource; private: Common::MemoryReadStream *_stream; - t_romset _ROMset; + ROMset _ROMset; byte *_buf; bool generateIndex(); bool generateResource(int res); - uint16 extractResource(Common::MemoryWriteStream *out, p_resource res); + uint16 extractResource(Common::MemoryWriteStream *out, Resource *res); - uint32 resOffset(p_resource res); - uint16 resLength(p_resource res); + uint32 resOffset(Resource *res); + uint16 resLength(Resource *res); - byte FileReadByte(); - uint16 FileReadUint16LE(); + byte fileReadByte(); + uint16 fileReadUint16LE(); public: ScummNESFile(); |