libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-23 02:11:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ZVISION: Prevent variable shadowing

Browse Source
This commit is contained in:
richiesams 2013-08-26 14:17:04 -05:00
parent 84c645968c
commit 610eb11824
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/zvision/lever_control.cpp
View File

@ -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