diff options
| author | Eugene Sandulenko | 2018-06-29 09:37:27 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-06-29 09:37:27 +0200 |
| commit | 7e82e748bfbc617d4298cc01fd0d3ac3e7a78592 (patch) | |
| tree | 80bce27ed5ae8afaca874fb07cc560cd3e7b3b8c /engines/sherlock | |
| parent | 63a29627351dda1dcd08e4c09a420f81bfed383e (diff) | |
| download | scummvm-rg350-7e82e748bfbc617d4298cc01fd0d3ac3e7a78592.tar.gz scummvm-rg350-7e82e748bfbc617d4298cc01fd0d3ac3e7a78592.tar.bz2 scummvm-rg350-7e82e748bfbc617d4298cc01fd0d3ac3e7a78592.zip | |
SHERLOCK: Fix shadowing warning
Diffstat (limited to 'engines/sherlock')
| -rw-r--r-- | engines/sherlock/image_file.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sherlock/image_file.cpp b/engines/sherlock/image_file.cpp index 5202401fdf..3a97cef875 100644 --- a/engines/sherlock/image_file.cpp +++ b/engines/sherlock/image_file.cpp @@ -376,14 +376,14 @@ void ImageFile3DO::loadAnimationFile(Common::SeekableReadStream &stream) { // // Load data for frame and decompress it - byte *data = new byte[celDataSize]; - stream.read(data, celDataSize); + byte *data_ = new byte[celDataSize]; + stream.read(data_, celDataSize); streamLeft -= celDataSize; // always 16 bits per pixel (RGB555) - decompress3DOCelFrame(frame, data, celDataSize, 16, NULL); + decompress3DOCelFrame(frame, data_, celDataSize, 16, NULL); - delete[] data; + delete[] data_; push_back(frame); } |