aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Hamm2002-03-08 21:40:50 +0000
committerVincent Hamm2002-03-08 21:40:50 +0000
commit8a31ebce903372f9439d2443e01d768cd18a0804 (patch)
tree81dd3016e5cdea77fbdea340a6ba265c6e784bda
parent66b8932d83fca91bebdef60498492d20f0d0c9cc (diff)
downloadscummvm-rg350-8a31ebce903372f9439d2443e01d768cd18a0804.tar.gz
scummvm-rg350-8a31ebce903372f9439d2443e01d768cd18a0804.tar.bz2
scummvm-rg350-8a31ebce903372f9439d2443e01d768cd18a0804.zip
Fixed an smush directory error
svn-id: r3691
-rw-r--r--insane.cpp9
-rw-r--r--scummvm.cpp5
2 files changed, 7 insertions, 7 deletions
diff --git a/insane.cpp b/insane.cpp
index 45da4aae50..90efd6c339 100644
--- a/insane.cpp
+++ b/insane.cpp
@@ -76,10 +76,15 @@ void SmushPlayer::openFile(byte* fileName) {
byte buf[100];
- sprintf((char*)buf,"%s%s%s",(char*)sm->_gameDataPath,(char*)sm->_videoPath,(char*)fileName);
-
+ sprintf((char*)buf,"%sVIDEO/%s",(char*)sm->_gameDataPath,(char*)fileName);
_in = fopen((char*)buf, "rb");
+ if(_in==NULL){
+ sprintf((char*)buf,"%svideo/%s",(char*)sm->_gameDataPath,(char*)fileName);
+ _in = fopen((char*)buf, "rb");
+
+ }
+
}
diff --git a/scummvm.cpp b/scummvm.cpp
index 360391e4cb..09c33fe8b4 100644
--- a/scummvm.cpp
+++ b/scummvm.cpp
@@ -222,11 +222,6 @@ void Scumm::scummMain(int argc, char **argv) {
else
setupScummVarsOld();
- if(_gameId == GID_FT)
- sprintf((char*)_videoPath,"VIDEO/");
- if(_gameId == GID_DIG)
- sprintf((char*)_videoPath,"video/");
-
if(_features & GF_AFTER_V7)
OF_OWNER_ROOM = 0xFF;
else