diff options
| author | Max Horn | 2003-06-20 12:25:37 +0000 |
|---|---|---|
| committer | Max Horn | 2003-06-20 12:25:37 +0000 |
| commit | 0832c1f662592990c9e8c2e5a6d7e5301e1d541b (patch) | |
| tree | dc61b277d17c52ad4e1d1babdc07c7e43a2da951 /simon | |
| parent | b62e3c942fea6bda1299a27c22def1d4e8cc3ca1 (diff) | |
| download | scummvm-rg350-0832c1f662592990c9e8c2e5a6d7e5301e1d541b.tar.gz scummvm-rg350-0832c1f662592990c9e8c2e5a6d7e5301e1d541b.tar.bz2 scummvm-rg350-0832c1f662592990c9e8c2e5a6d7e5301e1d541b.zip | |
reuse file, remove file2 usage
svn-id: r8573
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/sound.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/simon/sound.cpp b/simon/sound.cpp index f9c7785d50..80a7f89fbc 100644 --- a/simon/sound.cpp +++ b/simon/sound.cpp @@ -302,21 +302,21 @@ SimonSound::SimonSound(const byte game, const GameSpecificSettings *gss, const c #endif if (_game == GAME_SIMON1TALKIE) { - File *file2 = new File(); + file = new File(); #ifdef USE_MAD - file2->open(gss->mp3_effects_filename, gameDataPath); - if (file2->isOpen() == false) { + file->open(gss->mp3_effects_filename, gameDataPath); + if (file->isOpen() == false) { #endif s = gss->voc_effects_filename; - file2->open(s, gameDataPath); - if (file2->isOpen() == false) { + file->open(s, gameDataPath); + if (file->isOpen() == false) { warning("Can't open effects file %s", s); } else { - _effects = new VocSound(_mixer, file2); + _effects = new VocSound(_mixer, file); } #ifdef USE_MAD } else { - _effects = new MP3Sound(_mixer, file2); + _effects = new MP3Sound(_mixer, file); } #endif } |