diff options
| author | Torbjörn Andersson | 2014-01-18 03:18:40 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2014-01-18 03:18:40 +0100 |
| commit | 18ef3ed6b357bbe3ea35989b19ecac32fdf07892 (patch) | |
| tree | 0c30b610d8e40affec3e4a676c9f424d845be22b /engines/kyra | |
| parent | 16d36224e21bbd42349e6c64d525bc9c602162a5 (diff) | |
| download | scummvm-rg350-18ef3ed6b357bbe3ea35989b19ecac32fdf07892.tar.gz scummvm-rg350-18ef3ed6b357bbe3ea35989b19ecac32fdf07892.tar.bz2 scummvm-rg350-18ef3ed6b357bbe3ea35989b19ecac32fdf07892.zip | |
KYRA: Make pointers to VQAHeader const
This is just to enforce the idea that VQADecoder owns the VQAHeader
and that the audio/video tracks are only allowed to look at it, not
change it.
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/vqa.cpp | 4 | ||||
| -rw-r--r-- | engines/kyra/vqa.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/vqa.cpp b/engines/kyra/vqa.cpp index ab106d40f8..40da6f131c 100644 --- a/engines/kyra/vqa.cpp +++ b/engines/kyra/vqa.cpp @@ -282,7 +282,7 @@ void VQADecoder::readNextPacket() { // ----------------------------------------------------------------------- -VQADecoder::VQAAudioTrack::VQAAudioTrack(VQAHeader *header) { +VQADecoder::VQAAudioTrack::VQAAudioTrack(const VQAHeader *header) { _audioStream = Audio::makeQueuingAudioStream(header->freq, false); } @@ -395,7 +395,7 @@ void VQADecoder::VQAAudioTrack::handleSND2(Common::SeekableReadStream *stream) { // ----------------------------------------------------------------------- -VQADecoder::VQAVideoTrack::VQAVideoTrack(VQAHeader *header) { +VQADecoder::VQAVideoTrack::VQAVideoTrack(const VQAHeader *header) { memset(_palette, 0, sizeof(_palette)); _dirtyPalette = false; diff --git a/engines/kyra/vqa.h b/engines/kyra/vqa.h index 02414819db..f3890107a8 100644 --- a/engines/kyra/vqa.h +++ b/engines/kyra/vqa.h @@ -80,7 +80,7 @@ private: class VQAAudioTrack : public AudioTrack { public: - VQAAudioTrack(VQAHeader *header); + VQAAudioTrack(const VQAHeader *header); ~VQAAudioTrack(); void handleSND0(Common::SeekableReadStream *stream); @@ -96,7 +96,7 @@ private: class VQAVideoTrack : public FixedRateVideoTrack { public: - VQAVideoTrack(VQAHeader *header); + VQAVideoTrack(const VQAHeader *header); ~VQAVideoTrack(); uint16 getWidth() const; |