diff options
| author | Max Horn | 2003-07-28 14:50:54 +0000 |
|---|---|---|
| committer | Max Horn | 2003-07-28 14:50:54 +0000 |
| commit | 462898465acc4960d66ae4fbb5be3fc1cd317573 (patch) | |
| tree | b400f078f6cd8c678a1db1b70d1ee3531214e6a0 /sword2 | |
| parent | da1cdeb0ec4a74e093340cd1a82695b4c287c11c (diff) | |
| download | scummvm-rg350-462898465acc4960d66ae4fbb5be3fc1cd317573.tar.gz scummvm-rg350-462898465acc4960d66ae4fbb5be3fc1cd317573.tar.bz2 scummvm-rg350-462898465acc4960d66ae4fbb5be3fc1cd317573.zip | |
StopSpeech -> StopSpeechBS2 (avoid conflict wiht SpeechSynthesis framework on OS X)
svn-id: r9248
Diffstat (limited to 'sword2')
| -rw-r--r-- | sword2/driver/d_sound.cpp | 6 | ||||
| -rw-r--r-- | sword2/driver/driver96.h | 4 | ||||
| -rw-r--r-- | sword2/speech.cpp | 2 | ||||
| -rw-r--r-- | sword2/startup.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp index ed820fbaff..cc88f6aac0 100644 --- a/sword2/driver/d_sound.cpp +++ b/sword2/driver/d_sound.cpp @@ -225,7 +225,7 @@ // // -------------------------------------------------------------------------- // -// int32 StopSpeech(void) +// int32 StopSpeechBS2(void) // // Stops the speech from playing. // @@ -1131,10 +1131,10 @@ int32 PlayCompSpeech(const char *filename, uint32 speechid, uint8 vol, int8 pan) } -int32 StopSpeech(void) +int32 StopSpeechBS2(void) { - warning("stub StopSpeech"); + warning("stub StopSpeechBS2"); /* int32 status; diff --git a/sword2/driver/driver96.h b/sword2/driver/driver96.h index f3fe9db324..e66e007cba 100644 --- a/sword2/driver/driver96.h +++ b/sword2/driver/driver96.h @@ -824,7 +824,7 @@ // // -------------------------------------------------------------------------- // -// int32 StopSpeech(void) +// int32 StopSpeechBS2(void) // // Stops the speech from playing. // @@ -1566,7 +1566,7 @@ extern int32 PlayCompSpeech(const char *filename, uint32 speechid, uint8 vol, in extern int32 PreFetchCompSpeech(const char *filename, uint32 speechid, uint8 *waveMem); extern int32 GetCompSpeechSize(const char *filename, uint32 speechid); extern int32 AmISpeaking(); -extern int32 StopSpeech(void); +extern int32 StopSpeechBS2(void); extern int32 GetSpeechStatus(void); extern int32 PauseSpeech(void); extern int32 UnpauseSpeech(void); diff --git a/sword2/speech.cpp b/sword2/speech.cpp index 7558571a6d..abaf560955 100644 --- a/sword2/speech.cpp +++ b/sword2/speech.cpp @@ -1704,7 +1704,7 @@ int32 FN_i_speak(int32 *params) //Tony18Oct96 (revamped by James01july97) if (speechRunning) // if speech sample playing { - StopSpeech(); // halt the sample prematurely + StopSpeechBS2(); // halt the sample prematurely } } } diff --git a/sword2/startup.cpp b/sword2/startup.cpp index 7ecede6635..5cb0d9bcf3 100644 --- a/sword2/startup.cpp +++ b/sword2/startup.cpp @@ -291,7 +291,7 @@ uint32 Con_start(uint8 *input) //Tony15Oct96 //--------------------------------------------- UnpauseSpeech(); - StopSpeech(); // halt the sample prematurely + StopSpeechBS2(); // halt the sample prematurely //-------------------------------------------------------------- // clean out all resources & flags, ready for a total restart (James24mar97) |