diff options
| author | Le Philousophe | 2019-05-26 18:29:57 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2019-06-01 22:43:48 +0200 |
| commit | ff197718c239e10209d8eaf26c90c11af5ed1c80 (patch) | |
| tree | 18a344711b6d3388cf450a41dc88f6a223640d33 /engines/cryomni3d/video | |
| parent | 222f6b0e4cd5afc3d6aae8210b71908b111fca19 (diff) | |
| download | scummvm-rg350-ff197718c239e10209d8eaf26c90c11af5ed1c80.tar.gz scummvm-rg350-ff197718c239e10209d8eaf26c90c11af5ed1c80.tar.bz2 scummvm-rg350-ff197718c239e10209d8eaf26c90c11af5ed1c80.zip | |
CRYOMNI3D: Rename unsigned int to uint
Diffstat (limited to 'engines/cryomni3d/video')
| -rw-r--r-- | engines/cryomni3d/video/hnm_decoder.cpp | 13 | ||||
| -rw-r--r-- | engines/cryomni3d/video/hnm_decoder.h | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/engines/cryomni3d/video/hnm_decoder.cpp b/engines/cryomni3d/video/hnm_decoder.cpp index 0451828f0c..7d4c84e26b 100644 --- a/engines/cryomni3d/video/hnm_decoder.cpp +++ b/engines/cryomni3d/video/hnm_decoder.cpp @@ -82,7 +82,8 @@ bool HNMDecoder::loadStream(Common::SeekableReadStream *stream) { frameCount = 0; } - _videoTrack = new HNM4VideoTrack(width, height, frameSize, frameCount, _regularFrameDelay, _initialPalette); + _videoTrack = new HNM4VideoTrack(width, height, frameSize, frameCount, _regularFrameDelay, + _initialPalette); if (soundBits != 0 && soundChannels != 0) { // HNM4 is 22050Hz _audioTrack = new DPCMAudioTrack(soundChannels, soundBits, 22050, getSoundType()); @@ -202,8 +203,8 @@ void HNMDecoder::HNM4VideoTrack::decodePalette(Common::SeekableReadStream *strea if (size < 2) { break; } - unsigned int start = stream->readByte(); - unsigned int count = stream->readByte(); + uint start = stream->readByte(); + uint count = stream->readByte(); size -= 2; if (start == 255 && count == 255) { @@ -244,7 +245,7 @@ void HNMDecoder::HNM4VideoTrack::decodeInterframe(Common::SeekableReadStream *st uint16 width = _surface.w; bool eop = false; - unsigned int currentPos = 0; + uint currentPos = 0; while (!eop) { if (size < 1) { @@ -344,7 +345,7 @@ void HNMDecoder::HNM4VideoTrack::decodeIntraframe(Common::SeekableReadStream *st _nextNextFrameDelay = -1u; } -HNMDecoder::DPCMAudioTrack::DPCMAudioTrack(uint16 channels, uint16 bits, unsigned int sampleRate, +HNMDecoder::DPCMAudioTrack::DPCMAudioTrack(uint16 channels, uint16 bits, uint sampleRate, Audio::Mixer::SoundType soundType) : AudioTrack(soundType), _audioStream(nullptr), _gotLUT(false), _lastSample(0) { if (bits != 16) { @@ -369,7 +370,7 @@ Audio::Timestamp HNMDecoder::DPCMAudioTrack::decodeSound(Common::SeekableReadStr stream->read(_lut, 256 * sizeof(*_lut)); size -= 256 * sizeof(*_lut); #ifndef SCUMM_LITTLE_ENDIAN - for (unsigned int i = 0; i < 256; i++) { + for (uint i = 0; i < 256; i++) { _lut[i] = FROM_LE_16(_lut[i]); } #endif diff --git a/engines/cryomni3d/video/hnm_decoder.h b/engines/cryomni3d/video/hnm_decoder.h index c5d9307bb7..993638e180 100644 --- a/engines/cryomni3d/video/hnm_decoder.h +++ b/engines/cryomni3d/video/hnm_decoder.h @@ -98,7 +98,7 @@ private: class DPCMAudioTrack : public AudioTrack { public: - DPCMAudioTrack(uint16 channels, uint16 bits, unsigned int sampleRate, + DPCMAudioTrack(uint16 channels, uint16 bits, uint sampleRate, Audio::Mixer::SoundType soundType); ~DPCMAudioTrack(); |