diff options
| author | richiesams | 2013-08-26 14:17:04 -0500 |
|---|---|---|
| committer | richiesams | 2013-08-28 16:44:24 -0500 |
| commit | 610eb118246531e38173d67d6790b4737b1a6744 (patch) | |
| tree | b1bda65f2c34a98553b28a202f2d5f66315c4b5f /engines | |
| parent | 84c645968c9e93ca343e7c80c6f4546a793c2d41 (diff) | |
| download | scummvm-rg350-610eb118246531e38173d67d6790b4737b1a6744.tar.gz scummvm-rg350-610eb118246531e38173d67d6790b4737b1a6744.tar.bz2 scummvm-rg350-610eb118246531e38173d67d6790b4737b1a6744.zip | |
ZVISION: Prevent variable shadowing
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/zvision/lever_control.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/zvision/lever_control.cpp b/engines/zvision/lever_control.cpp index 5d9ea4db36..847defd942 100644 --- a/engines/zvision/lever_control.cpp +++ b/engines/zvision/lever_control.cpp @@ -97,13 +97,13 @@ void LeverControl::parseLevFile(const Common::String &fileName) { char fileNameBuffer[25]; sscanf(line.c_str(), "%*[^:]:%25[^~]~", fileNameBuffer); - Common::String fileName(fileNameBuffer); + Common::String animationFileName(fileNameBuffer); - if (fileName.hasSuffix(".avi")) { + if (animationFileName.hasSuffix(".avi")) { _animation.avi = new ZorkAVIDecoder(); - _animation.avi->loadFile(fileName); - } else if (fileName.hasSuffix(".rlf")) { - _animation.rlf = new RlfAnimation(fileNameBuffer, false); + _animation.avi->loadFile(animationFileName); + } else if (animationFileName.hasSuffix(".rlf")) { + _animation.rlf = new RlfAnimation(animationFileName, false); } } else if (line.matchString("*skipcolor*", true)) { // Not used |