[Scummvm-cvs-logs] CVS: scummvm/simon sound.cpp,1.23,1.24

[Max Horn]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv8095/simon

Modified Files:
	sound.cpp 
Log Message:
reuse file, remove file2 usage

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- sound.cpp	15 Jun 2003 12:22:19 -0000	1.23
+++ sound.cpp	20 Jun 2003 12:25:37 -0000	1.24
@@ -302,21 +302,21 @@
 #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
 	}