libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-03 15:41:41 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

StopSpeech -> StopSpeechBS2 (avoid conflict wiht SpeechSynthesis framework on OS X)

Browse Source 
svn-id: r9248
This commit is contained in:
Max Horn 2003-07-28 14:50:54 +00:00
parent da1cdeb0ec
commit 462898465a
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sword2/driver/d_sound.cpp
View File

@ -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;

4
sword2/driver/driver96.h
View File

@ -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);

2
sword2/speech.cpp
View File

@ -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
}
}
}

2
sword2/startup.cpp
View File

@ -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)