[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.242,1.243

[Oliver Kiehl]

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

Modified Files:
	simon.cpp 
Log Message:
cleanup


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -d -r1.242 -r1.243
--- simon.cpp	15 Jun 2003 05:19:00 -0000	1.242
+++ simon.cpp	15 Jun 2003 09:54:16 -0000	1.243
@@ -1075,23 +1075,25 @@
 	char filename[11];
 	uint16 size;
 
-	File _mus_file;
+	File mus_file;
+	uint16 *mus_offsets;
+
 	sprintf(filename, "STINGS%i.MUS", _midi_sfx);
-	_mus_file.open(filename, _gameDataPath);
-	if (!_mus_file.isOpen()) {
+	mus_file.open(filename, _gameDataPath);
+	if (!mus_file.isOpen()) {
 		warning("Can't load sound effect from '%s'", filename);
 		return;
 	}
 
-	size = _mus_file.readUint16LE();
-	_mus_offsets = (uint16 *)malloc(size);
+	size = mus_file.readUint16LE();
+	mus_offsets = (uint16 *)malloc(size);
 
-	_mus_file.seek(0, SEEK_SET);
-	if (_mus_file.read(_mus_offsets, size) != size)
+	mus_file.seek(0, SEEK_SET);
+	if (mus_file.read(mus_offsets, size) != size)
 		error("Can't read offsets");
 
-	_mus_file.seek(_mus_offsets[a], SEEK_SET);
-	midi.loadSMF (&_mus_file, a, true);
+	mus_file.seek(mus_offsets[a], SEEK_SET);
+	midi.loadSMF (&mus_file, a, true);
 	midi.startTrack (0);
 }