[Scummvm-git-logs] scummvm master -> d1140d102c5fe613d7faaa2adfe91d81e5e0d405

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d1140d102c TITANIC: Fix shadowed member warnings


Commit: d1140d102c5fe613d7faaa2adfe91d81e5e0d405
    https://github.com/scummvm/scummvm/commit/d1140d102c5fe613d7faaa2adfe91d81e5e0d405
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-02-10T21:36:08-05:00

Commit Message:
TITANIC: Fix shadowed member warnings

Changed paths:
    engines/titanic/sound/wave_file.cpp


diff --git a/engines/titanic/sound/wave_file.cpp b/engines/titanic/sound/wave_file.cpp
index 76a09a5..53cbc86 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;
 }