diff options
| author | Jonathan Gray | 2003-08-24 12:13:03 +0000 |
|---|---|---|
| committer | Jonathan Gray | 2003-08-24 12:13:03 +0000 |
| commit | a8ddcec684125cd2727f1ebed0f54e0325c37fa9 (patch) | |
| tree | 99ca2d5fae64a5dec621b0177550a1eaefd087d9 | |
| parent | 070a746de4faf753e4ed1a79ce74788747f58685 (diff) | |
| download | scummvm-rg350-a8ddcec684125cd2727f1ebed0f54e0325c37fa9.tar.gz scummvm-rg350-a8ddcec684125cd2727f1ebed0f54e0325c37fa9.tar.bz2 scummvm-rg350-a8ddcec684125cd2727f1ebed0f54e0325c37fa9.zip | |
be more tolerant of files being in different spots, and living on case sensitive filesystems
svn-id: r9846
| -rw-r--r-- | sword2/anims.cpp | 5 | ||||
| -rw-r--r-- | sword2/sound.cpp | 5 | ||||
| -rw-r--r-- | sword2/speech.cpp | 5 |
3 files changed, 5 insertions, 10 deletions
diff --git a/sword2/anims.cpp b/sword2/anims.cpp index eefd329104..764113c1f8 100644 --- a/sword2/anims.cpp +++ b/sword2/anims.cpp @@ -580,7 +580,7 @@ void CreateSequenceSpeech(_movieTextObject *sequenceText[]) // (James23may97) // first checking if we have speech1.clu or speech2.clu in current directory (for translators to test) if (g_sword2->_gameId == GID_SWORD2_DEMO) { - strcpy(speechFile,"SPEECH.CLU"); + strcpy(speechFile,"speech.clu"); } else { #ifdef _SWORD2_DEBUG @@ -595,8 +595,7 @@ void CreateSequenceSpeech(_movieTextObject *sequenceText[]) // (James23may97) else #endif // _SWORD2_DEBUG { - strcpy(speechFile,res_man.GetCdPath()); - strcat(speechFile,"CLUSTERS/SPEECH.CLU"); + strcpy(speechFile, "speech.clu"); } } //------------------------------ diff --git a/sword2/sound.cpp b/sword2/sound.cpp index 5c904df39c..e16c51b8ce 100644 --- a/sword2/sound.cpp +++ b/sword2/sound.cpp @@ -410,10 +410,7 @@ int32 FN_play_music(int32 *params) // updated by James on 10apr97 // add the appropriate file extension & play it - if (g_sword2->_gameId == GID_SWORD2_DEMO) - sprintf(filename,"MUSIC.CLU"); - else - sprintf(filename,"%sCLUSTERS/MUSIC.CLU", res_man.GetCdPath()); + sprintf(filename,"Music.clu"); rv = g_sword2->_sound->StreamCompMusic(filename, g_sword2->getGameDataPath(), params[0], loopFlag); diff --git a/sword2/speech.cpp b/sword2/speech.cpp index cbf13e4b12..d2f9258e2d 100644 --- a/sword2/speech.cpp +++ b/sword2/speech.cpp @@ -1566,7 +1566,7 @@ int32 FN_i_speak(int32 *params) //Tony18Oct96 (revamped by James01july97) // first checking if we have speech1.clu or speech2.clu in current directory (for translators to test) if (g_sword2->_gameId == GID_SWORD2_DEMO) - strcpy(speechFile,"SPEECH.CLU"); + strcpy(speechFile,"speech.clu"); else { #ifdef _SWORD2_DEBUG @@ -1577,8 +1577,7 @@ int32 FN_i_speak(int32 *params) //Tony18Oct96 (revamped by James01july97) } else #endif // _SWORD2_DEBUG { - strcpy(speechFile,res_man.GetCdPath()); - strcat(speechFile,"CLUSTERS/SPEECH.CLU"); + strcpy(speechFile,"speech.clu"); } } //------------------------------ |