gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-09 07:29:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r19211) -Change: allow sound sets without a sample.cat file (blathijs)

Browse Source
This commit is contained in:
yexo 2010-02-22 20:18:38 +00:00
parent 945d2c08e0
commit 1810351813
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sound.cpp
View File

@ -31,6 +31,9 @@ static void OpenBankFile(const char *filename)
{ {
memset(_original_sounds, 0, sizeof(_original_sounds)); memset(_original_sounds, 0, sizeof(_original_sounds));
/* If there is no sound file (nosound set), don't load anything */
if (filename == NULL) return;
FioOpenFile(SOUND_SLOT, filename); FioOpenFile(SOUND_SLOT, filename);
size_t pos = FioGetPos(); size_t pos = FioGetPos();
uint count = FioReadDword(); uint count = FioReadDword();
@ -162,6 +165,9 @@ static void StartSound(SoundID sound_id, int panning, uint volume)
const SoundEntry *sound = GetSound(sound_id); const SoundEntry *sound = GetSound(sound_id);
if (sound == NULL) return; if (sound == NULL) return;
/* Empty sound? */
if (sound->rate == 0) return;
MixerChannel *mc = MxAllocateChannel(); MixerChannel *mc = MxAllocateChannel();
if (mc == NULL) return; if (mc == NULL) return;