[Scummvm-git-logs] scummvm master -> 7631d04f29da55ce2863999355a0ea052ad63491

[digitall]

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:
7631d04f29 CHEWY: Fix GCC Shadowing Warnings


Commit: 7631d04f29da55ce2863999355a0ea052ad63491
    https://github.com/scummvm/scummvm/commit/7631d04f29da55ce2863999355a0ea052ad63491
Author: D G Turner (digitall at scummvm.org)
Date: 2022-04-11T22:55:29+01:00

Commit Message:
CHEWY: Fix GCC Shadowing Warnings

Changed paths:
    engines/chewy/atds.cpp


diff --git a/engines/chewy/atds.cpp b/engines/chewy/atds.cpp
index 29d19440ae9..44813040d72 100644
--- a/engines/chewy/atds.cpp
+++ b/engines/chewy/atds.cpp
@@ -358,17 +358,17 @@ void Atdsys::set_handle(const char *fname, int16 mode, int16 chunkStart, int16 c
 	_atdsPoolOff[mode] = chunkStart;
 
 	if (mode == INV_USE_DATA) {
-		const uint32 size = _text->getChunk(chunkStart)->size;
+		const uint32 chunkSize = _text->getChunk(chunkStart)->size;
 		const uint8 *chunkData = _text->getChunkData(chunkStart);
 
 		free(_invUseMem);
-		_invUseMem = (char *)MALLOC(size + 3l);
-		memcpy(_invUseMem, chunkData, size);
+		_invUseMem = (char *)MALLOC(chunkSize + 3l);
+		memcpy(_invUseMem, chunkData, chunkSize);
 		delete[] chunkData;
 
-		_invUseMem[size] = (char)BLOCKENDE;
-		_invUseMem[size + 1] = (char)BLOCKENDE;
-		_invUseMem[size + 2] = (char)BLOCKENDE;
+		_invUseMem[chunkSize] = (char)BLOCKENDE;
+		_invUseMem[chunkSize + 1] = (char)BLOCKENDE;
+		_invUseMem[chunkSize + 2] = (char)BLOCKENDE;
 	}
 }
 
@@ -376,13 +376,13 @@ void Atdsys::load_atds(int16 chunkNr, int16 mode) {
 	char *txt_adr = _atdsMem[mode];
 
 	if (_atdsHandle && txt_adr) {
-		const uint32 size = _text->getChunk(chunkNr + _atdsPoolOff[mode])->size;
+		const uint32 chunkSize = _text->getChunk(chunkNr + _atdsPoolOff[mode])->size;
 		const uint8 *chunkData = _text->getChunkData(chunkNr + _atdsPoolOff[mode]);
-		memcpy(txt_adr, chunkData, size);
+		memcpy(txt_adr, chunkData, chunkSize);
 		delete[] chunkData;
-		txt_adr[size] = (char)BLOCKENDE;
-		txt_adr[size + 1] = (char)BLOCKENDE;
-		txt_adr[size + 2] = (char)BLOCKENDE;
+		txt_adr[chunkSize] = (char)BLOCKENDE;
+		txt_adr[chunkSize + 1] = (char)BLOCKENDE;
+		txt_adr[chunkSize + 2] = (char)BLOCKENDE;
 	}
 }