diff options
| author | Eugene Sandulenko | 2016-09-14 23:48:01 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-01-25 22:41:54 +0100 |
| commit | 0fbe26e06ac2a9f128a102f5a291aad715f9e2a2 (patch) | |
| tree | e39154a8a22aad054ce9b6b757eef6d0ca383b89 /engines/cryo/ResourceManager.h | |
| parent | 85ba17c475f154c6e670e0fcd22642d680d85e6c (diff) | |
| download | scummvm-rg350-0fbe26e06ac2a9f128a102f5a291aad715f9e2a2.tar.gz scummvm-rg350-0fbe26e06ac2a9f128a102f5a291aad715f9e2a2.tar.bz2 scummvm-rg350-0fbe26e06ac2a9f128a102f5a291aad715f9e2a2.zip | |
CRYO: Use standard ScummVM types
Diffstat (limited to 'engines/cryo/ResourceManager.h')
| -rw-r--r-- | engines/cryo/ResourceManager.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/cryo/ResourceManager.h b/engines/cryo/ResourceManager.h index da38c9dfad..b50e6d6f55 100644 --- a/engines/cryo/ResourceManager.h +++ b/engines/cryo/ResourceManager.h @@ -12,11 +12,11 @@ namespace Cryo { template<typename T> class CryoArray { private: - unsigned char *_data; + byte *_data; bool _ownData; - unsigned short ElementOffset(int num) { + uint16 ElementOffset(int num) { assert(_data && num < Count()) - return (static_cast<unsigned short *>_data)[num]; + return (static_cast<uint16 *>_data)[num]; } public: CryoArray(void *data, bool ownData) : _data(data), _ownData(ownData) { @@ -25,7 +25,7 @@ public: if (_ownData) delete data; } - unsigned short Count() { + uint16 Count() { return ElementOffset(0) / 2; } const T *operator[](int index) { @@ -39,7 +39,7 @@ private: char _name[16]; unsigned int _size; unsigned int _offset; - unsigned char _flag; + byte _flag; }; Common::Array<DatFileEntry> _files; @@ -67,4 +67,4 @@ public: }; -}
\ No newline at end of file +} |