[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.240,1.241
Travis Howell
kirben at users.sourceforge.net
Sat Jun 14 22:05:06 CEST 2003
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv11188/simon
Modified Files:
simon.cpp
Log Message:
Small cleanup
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -d -r1.240 -r1.241
--- simon.cpp 15 Jun 2003 01:42:17 -0000 1.240
+++ simon.cpp 15 Jun 2003 05:04:17 -0000 1.241
@@ -1075,23 +1075,23 @@
char filename[11];
uint16 size;
- _mus_file = new File();
+ File _mus_file;
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();
+ 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);
}
More information about the Scummvm-git-logs
mailing list