diff options
| author | Matthew Stewart | 2018-08-02 02:15:29 -0400 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-08-09 08:37:30 +0200 |
| commit | ba05b5539ba458c87cb804a5658b153a48f7338b (patch) | |
| tree | 11619a5d27de22b53bb70e7770c3458f6818a909 /engines/startrek/filestream.cpp | |
| parent | ce42cd940a8fd3706aebc9ba79de6823939ab53b (diff) | |
| download | scummvm-rg350-ba05b5539ba458c87cb804a5658b153a48f7338b.tar.gz scummvm-rg350-ba05b5539ba458c87cb804a5658b153a48f7338b.tar.bz2 scummvm-rg350-ba05b5539ba458c87cb804a5658b153a48f7338b.zip | |
STARTREK: Various code cleanup
Diffstat (limited to 'engines/startrek/filestream.cpp')
| -rw-r--r-- | engines/startrek/filestream.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/startrek/filestream.cpp b/engines/startrek/filestream.cpp index 1cb83f53fa..b4fa2d27e5 100644 --- a/engines/startrek/filestream.cpp +++ b/engines/startrek/filestream.cpp @@ -57,9 +57,9 @@ uint16 FileStream::readUint16() { assert(_pos + 2 <= size()); uint16 w; if (_bigEndian) - w = _data[_pos + 1] | (_data[_pos] << 8); + w = READ_BE_UINT16(_data + _pos); else - w = _data[_pos] | (_data[_pos + 1] << 8); + w = READ_LE_UINT16(_data + _pos); _pos += 2; return w; } @@ -68,9 +68,9 @@ uint32 FileStream::readUint32() { assert(_pos + 4 <= size()); uint32 w; if (_bigEndian) - w = _data[_pos + 3] | (_data[_pos + 2] << 8) | (_data[_pos + 1] << 16) | (_data[_pos] << 24); + w = READ_BE_UINT32(_data + _pos); else - w = _data[_pos] | (_data[_pos + 1] << 8) | (_data[_pos + 2] << 16) | (_data[_pos + 3] << 24); + w = READ_LE_UINT32(_data + _pos); _pos += 4; return w; } |