diff options
| author | Jonathan Gray | 2003-07-28 07:00:15 +0000 |
|---|---|---|
| committer | Jonathan Gray | 2003-07-28 07:00:15 +0000 |
| commit | 77cf6b7c3e66cca495e9ddbc92dad68a1874ee17 (patch) | |
| tree | 9666199f71264dad443687a0326099c62800973a /sword2/speech.cpp | |
| parent | 376f78f7f650604d580a3c681ab20b490667f289 (diff) | |
| download | scummvm-rg350-77cf6b7c3e66cca495e9ddbc92dad68a1874ee17.tar.gz scummvm-rg350-77cf6b7c3e66cca495e9ddbc92dad68a1874ee17.tar.bz2 scummvm-rg350-77cf6b7c3e66cca495e9ddbc92dad68a1874ee17.zip | |
add bs2demo target for broken sword 2 demo
svn-id: r9229
Diffstat (limited to 'sword2/speech.cpp')
| -rw-r--r-- | sword2/speech.cpp | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/sword2/speech.cpp b/sword2/speech.cpp index 7c9a10e782..fe1979b4a4 100644 --- a/sword2/speech.cpp +++ b/sword2/speech.cpp @@ -40,6 +40,7 @@ #include "resman.h" #include "sound.h" #include "speech.h" +#include "sword2.h" #include "walker.h" //------------------------------------------------------------------------------------ @@ -1564,27 +1565,22 @@ int32 FN_i_speak(int32 *params) //Tony18Oct96 (revamped by James01july97) // set up path to speech cluster // first checking if we have speech1.clu or speech2.clu in current directory (for translators to test) -#ifdef _WEBDEMO // (James 01oct97) - strcpy(speechFile,"SPEECH.CLU"); -#else - + if (g_bs2->_gameId == GID_BS2_DEMO) + strcpy(speechFile,"SPEECH.CLU"); + else { #ifdef _DEBUG - if ((res_man.WhichCd()==1) && (!access("speech1.clu",0))) // if 0 ie. if it's there - { + if ((res_man.WhichCd()==1) && (!access("speech1.clu",0))) { // if 0 ie. if it's there strcpy(speechFile,"speech1.clu"); - } - else if ((res_man.WhichCd()==2) && (!access("speech2.clu",0))) // if 0 ie. if it's there - { - strcpy(speechFile,"speech2.clu"); - } - else + } else if ((res_man.WhichCd()==2) && (!access("speech2.clu",0))) { // if 0 ie. if it's there + strcpy(speechFile,"speech2.clu"); + } else #endif // _DEBUG - { - strcpy(speechFile,res_man.GetCdPath()); - strcat(speechFile,"CLUSTERS\\SPEECH.CLU"); + { + strcpy(speechFile,res_man.GetCdPath()); + strcat(speechFile,"CLUSTERS\\SPEECH.CLU"); + } } -#endif // _WEBDEMO //------------------------------ |