diff options
| author | Filippos Karapetis | 2015-07-09 12:00:08 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2015-07-09 12:00:08 +0300 |
| commit | f0a03fcd1b0190e6527df1d51e5a86c77f0f5195 (patch) | |
| tree | 002eb25d1479b9f6d129661d182a1056e34c90dd | |
| parent | a620632a5f9dd97db3c0a2f5a44a2fe8ff41809a (diff) | |
| download | scummvm-rg350-f0a03fcd1b0190e6527df1d51e5a86c77f0f5195.tar.gz scummvm-rg350-f0a03fcd1b0190e6527df1d51e5a86c77f0f5195.tar.bz2 scummvm-rg350-f0a03fcd1b0190e6527df1d51e5a86c77f0f5195.zip | |
SHERLOCK: Rename variable to avoid shadowing
Reported by eriktorbjorn
| -rw-r--r-- | engines/sherlock/scene.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp index 4e5cacb5b2..2f8762e7bd 100644 --- a/engines/sherlock/scene.cpp +++ b/engines/sherlock/scene.cpp @@ -1099,15 +1099,15 @@ void Scene::checkSceneFlags(bool flag) { for (uint idx = 0; idx < _bgShapes.size(); ++idx) { Object &o = _bgShapes[idx]; - bool flag = true; + bool objectFlag = true; if (o._requiredFlag[0] || o._requiredFlag[1]) { if (o._requiredFlag[0] != 0) - flag = _vm->readFlags(o._requiredFlag[0]); + objectFlag = _vm->readFlags(o._requiredFlag[0]); if (o._requiredFlag[1] != 0) - flag &= _vm->readFlags(o._requiredFlag[1]); + objectFlag &= _vm->readFlags(o._requiredFlag[1]); - if (!flag) { + if (!objectFlag) { // Kill object if (o._type != HIDDEN && o._type != INVALID) { if (o._images == nullptr || o._images->size() == 0) |