diff --git a/sc2/ChangeLog b/sc2/ChangeLog index fb4c04b87..cc3bf893c 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,6 @@ Changes towards version 0.7: +- Renamed PlaySpeeh/StopSpeech to work around name collisions + on OSX - Alex - Ending the battle with a simultaneous death no longer triggers an assertion - SvdB - Concurrent supermelee ship selection - SvdB diff --git a/sc2/src/sc2code/libs/sndlib.h b/sc2/src/sc2code/libs/sndlib.h index 3fc1e0b77..0a6aecaf7 100644 --- a/sc2/src/sc2code/libs/sndlib.h +++ b/sc2/src/sc2code/libs/sndlib.h @@ -72,8 +72,8 @@ extern void PLRStop (MUSIC_REF MusicRef); extern BOOLEAN PLRPlaying (MUSIC_REF MusicRef); extern void PLRPause (MUSIC_REF MusicRef); extern void PLRResume (MUSIC_REF MusicRef); -extern void PlaySpeech (MUSIC_REF SpeechRef); -extern void StopSpeech (void); +extern void snd_PlaySpeech (MUSIC_REF SpeechRef); +extern void snd_StopSpeech (void); extern void PlayChannel (COUNT channel, void *sample, SoundPosition pos, void *positional_object, unsigned char priority); extern BOOLEAN ChannelPlaying (COUNT Channel); diff --git a/sc2/src/sc2code/libs/sound/music.c b/sc2/src/sc2code/libs/sound/music.c index fc2c81e74..293814f2b 100644 --- a/sc2/src/sc2code/libs/sound/music.c +++ b/sc2/src/sc2code/libs/sound/music.c @@ -97,7 +97,7 @@ PLRResume (MUSIC_REF MusicRef) } void -PlaySpeech (MUSIC_REF SpeechRef) +snd_PlaySpeech (MUSIC_REF SpeechRef) { TFB_SoundSample **pmus; @@ -113,7 +113,7 @@ PlaySpeech (MUSIC_REF SpeechRef) } void -StopSpeech (void) +snd_StopSpeech (void) { if (!curSpeechRef) return; diff --git a/sc2/src/sc2code/libs/video/video.c b/sc2/src/sc2code/libs/video/video.c index 3785c3ba2..3228abd09 100644 --- a/sc2/src/sc2code/libs/video/video.c +++ b/sc2/src/sc2code/libs/video/video.c @@ -52,7 +52,7 @@ void VidStop () { if (_cur_speech) - StopSpeech (); + snd_StopSpeech (); if (_cur_video) { TFB_StopVideo (_cur_video); @@ -97,7 +97,7 @@ VidPlayEx (VIDEO_REF VidRef, MUSIC_REF AudRef, MUSIC_REF SpeechRef, vid->loop_to = 0; if (_cur_speech) - StopSpeech (); + snd_StopSpeech (); if (_cur_video) TFB_StopVideo (_cur_video); _cur_speech = 0; @@ -115,7 +115,7 @@ VidPlayEx (VIDEO_REF VidRef, MUSIC_REF AudRef, MUSIC_REF SpeechRef, ret = SOFTWARE_FMV; if (SpeechRef) { - PlaySpeech (SpeechRef); + snd_PlaySpeech (SpeechRef); _cur_speech = SpeechRef; } }