aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorbjörn Andersson2009-02-21 11:22:56 +0000
committerTorbjörn Andersson2009-02-21 11:22:56 +0000
commitc3068549da7bf05483263ce041b3fd863d9ef92d (patch)
treeb221aba7411fe67f934af21ef5bc81bf3d6b9e46
parentd8d6aaa461ad8e72b97cb6cc05ee5809943ddf3a (diff)
downloadscummvm-rg350-c3068549da7bf05483263ce041b3fd863d9ef92d.tar.gz
scummvm-rg350-c3068549da7bf05483263ce041b3fd863d9ef92d.tar.bz2
scummvm-rg350-c3068549da7bf05483263ce041b3fd863d9ef92d.zip
Cleanup.
svn-id: r38680
-rw-r--r--engines/sword1/animation.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp
index 43b8958e48..81d7839a29 100644
--- a/engines/sword1/animation.cpp
+++ b/engines/sword1/animation.cpp
@@ -85,7 +85,7 @@ MoviePlayer::~MoviePlayer(void) {
*/
bool MoviePlayer::load(uint32 id) {
Common::File f;
- char fileName[20];
+ char filename[20];
if (_decoderType == kVideoDecoderDXA) {
_bgSoundStream = Audio::AudioStream::openStreamFile(sequenceList[id]);
@@ -94,8 +94,8 @@ bool MoviePlayer::load(uint32 id) {
}
if (SwordEngine::_systemVars.showText) {
- sprintf(fileName, "%s.txt", sequenceList[id]);
- if (f.open(fileName)) {
+ sprintf(filename, "%s.txt", sequenceList[id]);
+ if (f.open(filename)) {
Common::String line;
int lineNo = 0;
int lastEnd = -1;
@@ -118,22 +118,22 @@ bool MoviePlayer::load(uint32 id) {
ptr++;
if (startFrame > endFrame) {
- warning("%s:%d: startFrame (%d) > endFrame (%d)", fileName, lineNo, startFrame, endFrame);
+ warning("%s:%d: startFrame (%d) > endFrame (%d)", filename, lineNo, startFrame, endFrame);
continue;
}
if (startFrame <= lastEnd) {
- warning("%s:%d startFrame (%d) <= lastEnd (%d)", fileName, lineNo, startFrame, lastEnd);
+ warning("%s:%d startFrame (%d) <= lastEnd (%d)", filename, lineNo, startFrame, lastEnd);
continue;
}
_movieTexts.push_back(new MovieText(startFrame, endFrame, ptr));
lastEnd = endFrame;
}
+ f.close();
}
}
- char filename[20];
switch (_decoderType) {
case kVideoDecoderDXA:
snprintf(filename, sizeof(filename), "%s.dxa", sequenceList[id]);