aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorMax Horn2004-08-05 11:13:00 +0000
committerMax Horn2004-08-05 11:13:00 +0000
commitb4223febd350ffaa2265570669e88a30642c4ca1 (patch)
tree73cf089aa11e3e26f669e73f44783215889efeec /graphics
parent61bf615168d1619f97d00ed7b08ea4a92c916732 (diff)
downloadscummvm-rg350-b4223febd350ffaa2265570669e88a30642c4ca1.tar.gz
scummvm-rg350-b4223febd350ffaa2265570669e88a30642c4ca1.tar.bz2
scummvm-rg350-b4223febd350ffaa2265570669e88a30642c4ca1.zip
Enhanced extrapath support
svn-id: r14470
Diffstat (limited to 'graphics')
-rw-r--r--graphics/animation.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/graphics/animation.cpp b/graphics/animation.cpp
index 32468fd6bd..63f1a2fb67 100644
--- a/graphics/animation.cpp
+++ b/graphics/animation.cpp
@@ -47,8 +47,6 @@ BaseAnimationState::~BaseAnimationState() {
bool BaseAnimationState::init(const char *name) {
- const Common::String ePath = ConfMan.get("extrapath");
-
#ifdef USE_MPEG2
char tempFile[512];
@@ -65,7 +63,7 @@ bool BaseAnimationState::init(const char *name) {
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 @@ bool BaseAnimationState::init(const char *name) {
// 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 @@ bool BaseAnimationState::init(const char *name) {
// 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);