From 610eb118246531e38173d67d6790b4737b1a6744 Mon Sep 17 00:00:00 2001 From: richiesams Date: Mon, 26 Aug 2013 14:17:04 -0500 Subject: ZVISION: Prevent variable shadowing --- engines/zvision/lever_control.cpp | 10 +++++----- 1 file 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 -- cgit v1.2.3