From d1140d102c5fe613d7faaa2adfe91d81e5e0d405 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Fri, 10 Feb 2017 21:36:08 -0500 Subject: TITANIC: Fix shadowed member warnings --- engines/titanic/sound/wave_file.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'engines') diff --git a/engines/titanic/sound/wave_file.cpp b/engines/titanic/sound/wave_file.cpp index 76a09a573c..53cbc86b05 100644 --- a/engines/titanic/sound/wave_file.cpp +++ b/engines/titanic/sound/wave_file.cpp @@ -115,11 +115,11 @@ bool CWaveFile::loadSound(const CString &name) { return false; Common::SeekableReadStream *stream = file.readStream(); - uint size = stream->size(); - byte *data = new byte[size]; - stream->read(data, size); + uint wavSize = stream->size(); + byte *data = new byte[wavSize]; + stream->read(data, wavSize); - load(data, size); + load(data, wavSize); _soundType = Audio::Mixer::kSFXSoundType; return true; } @@ -145,12 +145,12 @@ bool CWaveFile::loadMusic(const CString &name) { return false; Common::SeekableReadStream *stream = file.readStream(); - uint size = stream->size(); - byte *data = new byte[size]; - stream->read(data, size); + uint wavSize = stream->size(); + byte *data = new byte[wavSize]; + stream->read(data, wavSize); delete stream; - load(data, size); + load(data, wavSize); _soundType = Audio::Mixer::kMusicSoundType; return true; } -- cgit v1.2.3