diff options
| author | Paul Gilbert | 2017-02-10 21:36:08 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2017-02-10 21:36:08 -0500 |
| commit | d1140d102c5fe613d7faaa2adfe91d81e5e0d405 (patch) | |
| tree | 437631f21bfc61c95fd756de082880c09f114d7f /engines | |
| parent | f9cd01fe0384dc3f59c7da3f5f2dc269a53a47e0 (diff) | |
| download | scummvm-rg350-d1140d102c5fe613d7faaa2adfe91d81e5e0d405.tar.gz scummvm-rg350-d1140d102c5fe613d7faaa2adfe91d81e5e0d405.tar.bz2 scummvm-rg350-d1140d102c5fe613d7faaa2adfe91d81e5e0d405.zip | |
TITANIC: Fix shadowed member warnings
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/titanic/sound/wave_file.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
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; } |