From 43e67a12b62745541b33a9ad0d0e35fdabea3678 Mon Sep 17 00:00:00 2001
From: nehalmistry <>
Date: Wed, 2 Apr 2003 03:41:47 +0000
Subject: [PATCH] stop briefing when game starts
---
src/game/intro.cpp | 11 +----------
src/include/sound_server.h | 3 +++
src/sound/sound_server.cpp | 2 +-
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/src/game/intro.cpp b/src/game/intro.cpp
index 8328381b0..89ee83de0 100644
--- a/src/game/intro.cpp
+++ b/src/game/intro.cpp
@@ -436,7 +436,6 @@ global void ShowIntro(const Intro *intro)
CLclose(file);
CallbackMusicOff();
- StopMusic();
#ifdef WITH_SOUND
PlaySectionMusic(PlaySectionBriefing);
#endif
@@ -557,15 +556,7 @@ global void ShowIntro(const Intro *intro)
SetVideoSync();
CallbackMusicOn();
- StopMusic();
- // FIXME: should this be GameMusic?
-#ifdef WITH_SOUND
- if (CDMode == CDModeOff || CDMode == CDModeStopped) {
- PlayMusic(MenuMusic);
- } else {
- CDRomCheck(NULL);
- }
-#endif
+ FreeOneChannel(soundfree);
}
/**
diff --git a/src/include/sound_server.h b/src/include/sound_server.h
index 667d0d764..966e33122 100644
--- a/src/include/sound_server.h
+++ b/src/include/sound_server.h
@@ -307,6 +307,9 @@ extern SoundId RegisterTwoGroups(const SoundId first,const SoundId second);
/// Modify the range of a given sound.
extern void SetSoundRange(SoundId sound,unsigned char range);
+ /// Free a channel and unregister its source
+extern void FreeOneChannel(int channel);
+
/// Initialize the sound card.
extern int InitSound(void);
/// Initialize the oss compatible sound card.
diff --git a/src/sound/sound_server.cpp b/src/sound/sound_server.cpp
index 374e8c1ab..edc0a8bf1 100644
--- a/src/sound/sound_server.cpp
+++ b/src/sound/sound_server.cpp
@@ -602,7 +602,7 @@ local Sample* ChooseSample(SoundRequest* sr)
/*
** Free a channel and unregister its source
*/
-local void FreeOneChannel(int channel)
+global void FreeOneChannel(int channel)
{
Channels[channel].Command=ChannelFree;
Channels[channel].Point=NextFreeChannel;