[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.14,1.15 sound.cpp,1.322,1.323 string.cpp,1.208,1.209
Max Horn
fingolfin at users.sourceforge.net
Fri Apr 2 17:10:05 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22377
Modified Files:
scumm.cpp sound.cpp string.cpp
Log Message:
cleanup
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- scumm.cpp 2 Apr 2004 21:56:27 -0000 1.14
+++ scumm.cpp 3 Apr 2004 00:56:53 -0000 1.15
@@ -505,7 +505,6 @@
_copyProtection = false;
_demoMode = false;
_confirmExit = false;
- _msgPtrToAdd = NULL;
_talkDelay = 0;
_keepText = false;
_existLanguageFile = false;
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -d -r1.322 -r1.323
--- sound.cpp 15 Mar 2004 03:33:08 -0000 1.322
+++ sound.cpp 3 Apr 2004 00:56:54 -0000 1.323
@@ -881,8 +881,8 @@
#ifdef USE_FLAC
if (!file->isOpen()) {
sprintf(buf, "%s.sof", _vm->getGameName());
- if (!file->open(buf, _vm->getGameDataPath()))
- file->open("monster.sof", _vm->getGameDataPath());
+ if (!file->open(buf))
+ file->open("monster.sof");
if (file->isOpen())
_sound_mode = kFlacMode;
}
@@ -891,8 +891,8 @@
#ifdef USE_MAD
if (!file->isOpen()) {
sprintf(buf, "%s.so3", _vm->getGameName());
- if (!file->open(buf, _vm->getGameDataPath()))
- file->open("monster.so3", _vm->getGameDataPath());
+ if (!file->open(buf))
+ file->open("monster.so3");
if (file->isOpen())
_sound_mode = kMP3Mode;
}
@@ -901,8 +901,8 @@
#ifdef USE_VORBIS
if (!file->isOpen()) {
sprintf(buf, "%s.sog", _vm->getGameName());
- if (!file->open(buf, _vm->getGameDataPath()))
- file->open("monster.sog", _vm->getGameDataPath());
+ if (!file->open(buf))
+ file->open("monster.sog");
if (file->isOpen())
_sound_mode = kVorbisMode;
}
@@ -943,8 +943,8 @@
}
sprintf(buf, "%s.sou", _vm->getGameName());
- if (!file->open(buf, _vm->getGameDataPath())) {
- file->open("monster.sou", _vm->getGameDataPath());
+ if (!file->open(buf)) {
+ file->open("monster.sou");
}
if (!file->isOpen()) {
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -d -r1.208 -r1.209
--- string.cpp 2 Apr 2004 21:55:30 -0000 1.208
+++ string.cpp 3 Apr 2004 00:56:55 -0000 1.209
@@ -719,9 +719,9 @@
int32 size;
if (_gameId == GID_DIG) {
- file.open("language.bnd", getGameDataPath());
+ file.open("language.bnd");
} else if (_gameId == GID_CMI) {
- file.open("language.tab", getGameDataPath());
+ file.open("language.tab");
} else {
return;
}
More information about the Scummvm-git-logs
mailing list