[Scummvm-cvs-logs] CVS: scummvm/graphics animation.cpp,1.10,1.11

[Max Horn]

Update of /cvsroot/scummvm/scummvm/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2200/graphics

Modified Files:
	animation.cpp 
Log Message:
Enhanced extrapath support

Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/graphics/animation.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- animation.cpp	19 Jul 2004 11:35:29 -0000	1.10
+++ animation.cpp	5 Aug 2004 11:13:00 -0000	1.11
@@ -47,8 +47,6 @@
 
 
 bool BaseAnimationState::init(const char *name) {
-	const Common::String ePath = ConfMan.get("extrapath");
-
 #ifdef USE_MPEG2
 	char tempFile[512];
 
@@ -65,7 +63,7 @@
 
 	File f;
 
-	if (!f.open(tempFile) && !f.open(tempFile, File::kFileReadMode, ePath.c_str())) {
+	if (!f.open(tempFile)) {
 		warning("Cutscene: %s palette missing", tempFile);
 		return false;
 	}
@@ -114,8 +112,7 @@
 	// Open MPEG2 stream
 	mpgfile = new File();
 	sprintf(tempFile, "%s.mp2", name);
-	if (!mpgfile->open(tempFile) && 
-	    !mpgfile->open(tempFile, File::kFileReadMode, ePath.c_str())) {
+	if (!mpgfile->open(tempFile)) {
 		warning("Cutscene: Could not open %s", tempFile);
 		return false;
 	}
@@ -134,8 +131,6 @@
 
 	// Play audio
 	bgSoundStream = AudioStream::openStreamFile(name);
-	if (bgSoundStream == NULL)
-		bgSoundStream = AudioStream::openStreamFile(name, ePath.c_str());
 
 	if (bgSoundStream != NULL) {
 		_snd->playInputStream(&bgSound, bgSoundStream, false, 255, 0, -1, false);