diff options
| author | Alyssa Milburn | 2011-08-17 10:12:37 +0200 |
|---|---|---|
| committer | Alyssa Milburn | 2011-08-17 10:12:37 +0200 |
| commit | 9a94a239b8b9099ebfb8b4061ca68a0a7b1174b7 (patch) | |
| tree | c9c199e2bbf29cafbb41587ca11b7dbb3e4e3fef | |
| parent | 1d3f1830c890f2f4f2fbb8fcf4db90dfe1bacdde (diff) | |
| download | scummvm-rg350-9a94a239b8b9099ebfb8b4061ca68a0a7b1174b7.tar.gz scummvm-rg350-9a94a239b8b9099ebfb8b4061ca68a0a7b1174b7.tar.bz2 scummvm-rg350-9a94a239b8b9099ebfb8b4061ca68a0a7b1174b7.zip | |
CGE: Fix gcc shadowed member warning.
| -rw-r--r-- | engines/cge/general.cpp | 4 | ||||
| -rw-r--r-- | engines/cge/sound.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/cge/general.cpp b/engines/cge/general.cpp index 6d7b1daf88..112de730ec 100644 --- a/engines/cge/general.cpp +++ b/engines/cge/general.cpp @@ -292,9 +292,9 @@ int newRandom(int range) { return ((CGEEngine *)g_engine)->_randomSource.getRandomNumber(range - 1); } -DataCk::DataCk(byte *buf, int size) { +DataCk::DataCk(byte *buf, int bufSize) { _buf = buf; - _ckSize = size; + _ckSize = bufSize; } DataCk::~DataCk() { diff --git a/engines/cge/sound.h b/engines/cge/sound.h index 01b11487d0..e6bc2dedde 100644 --- a/engines/cge/sound.h +++ b/engines/cge/sound.h @@ -47,7 +47,7 @@ class DataCk { byte *_buf; int _ckSize; public: - DataCk(byte *buf, int size); + DataCk(byte *buf, int bufSize); ~DataCk(); inline const byte *addr() { return _buf; |