From 03c871ff3025457067bb504af0799c901498253e Mon Sep 17 00:00:00 2001 From: richiesams Date: Wed, 17 Jul 2013 17:16:19 -0500 Subject: ZVISION: Convert _stereo to a byte since it is used for a bitwise and --- engines/zvision/zork_raw.cpp | 5 ++++- engines/zvision/zork_raw.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/engines/zvision/zork_raw.cpp b/engines/zvision/zork_raw.cpp index 140e6a532b..68bb25dd48 100644 --- a/engines/zvision/zork_raw.cpp +++ b/engines/zvision/zork_raw.cpp @@ -54,9 +54,12 @@ const int32 RawZorkStream::_amplitudeLookupTable[89] = {0x0007, 0x0008, 0x0009, RawZorkStream::RawZorkStream(uint32 rate, bool stereo, DisposeAfterUse::Flag disposeStream, Common::SeekableReadStream *stream) : _rate(rate), - _stereo(stereo), + _stereo(0), _stream(stream, disposeStream), _endOfData(false) { + if (stereo) + _stereo = 1; + _lastSample[0].index = 0; _lastSample[0].sample = 0; _lastSample[1].index = 0; diff --git a/engines/zvision/zork_raw.h b/engines/zvision/zork_raw.h index 8d4670e26c..6d25d197ee 100644 --- a/engines/zvision/zork_raw.h +++ b/engines/zvision/zork_raw.h @@ -73,7 +73,7 @@ private: Audio::Timestamp _playtime; // Calculated total play time Common::DisposablePtr _stream; // Stream to read data from bool _endOfData; // Whether the stream end has been reached - bool _stereo; + byte _stereo; /** * Holds the frequency and index from the last sample -- cgit v1.2.3