libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-04 16:26:53 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

reuse file, remove file2 usage

Browse Source 
svn-id: r8573
This commit is contained in:
Max Horn 2003-06-20 12:25:37 +00:00
parent b62e3c942f
commit 0832c1f662
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
simon/sound.cpp
View File

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