gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-06-26 06:59:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

(svn r16341) -Codechange: just use a static array instead of a never freed malloc

Browse Source
This commit is contained in:
rubidium 2009-05-17 17:48:05 +00:00
parent 9c24e2bb8f
commit e56cc911f1
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/sound.cpp
View File

@ -13,7 +13,7 @@
#include "vehicle_base.h" #include "vehicle_base.h"
#include "debug.h" #include "debug.h"
static FileEntry *_files; static FileEntry _original_sounds[ORIGINAL_SAMPLE_COUNT];
MusicFileSettings msf; MusicFileSettings msf;
/* Number of levels of panning per side */ /* Number of levels of panning per side */
@ -21,8 +21,7 @@ MusicFileSettings msf;
static void OpenBankFile(const char *filename) static void OpenBankFile(const char *filename)
{ {
FileEntry *fe = CallocT<FileEntry>(ORIGINAL_SAMPLE_COUNT); memset(_original_sounds, 0, sizeof(_original_sounds));
_files = fe;
FioOpenFile(SOUND_SLOT, filename); FioOpenFile(SOUND_SLOT, filename);
size_t pos = FioGetPos(); size_t pos = FioGetPos();
@ -40,12 +39,13 @@ static void OpenBankFile(const char *filename)
FioSeekTo(pos, SEEK_SET); FioSeekTo(pos, SEEK_SET);
for (uint i = 0; i != ORIGINAL_SAMPLE_COUNT; i++) { for (uint i = 0; i != ORIGINAL_SAMPLE_COUNT; i++) {
fe[i].file_slot = SOUND_SLOT; _original_sounds[i].file_slot = SOUND_SLOT;
fe[i].file_offset = FioReadDword() + pos; _original_sounds[i].file_offset = FioReadDword() + pos;
fe[i].file_size = FioReadDword(); _original_sounds[i].file_size = FioReadDword();
} }
for (uint i = 0; i != ORIGINAL_SAMPLE_COUNT; i++, fe++) { for (uint i = 0; i != ORIGINAL_SAMPLE_COUNT; i++) {
FileEntry *fe = &_original_sounds[i];
char name[255]; char name[255];
FioSeekTo(fe->file_offset, SEEK_SET); FioSeekTo(fe->file_offset, SEEK_SET);
@ -178,10 +178,9 @@ static const byte _sound_idx[] = {
void SndCopyToPool() void SndCopyToPool()
{ {
for (uint i = 0; i < ORIGINAL_SAMPLE_COUNT; i++) { for (uint i = 0; i < ORIGINAL_SAMPLE_COUNT; i++) {
FileEntry *orig = &_files[_sound_idx[i]];
FileEntry *fe = AllocateFileEntry(); FileEntry *fe = AllocateFileEntry();
*fe = *orig; *fe = _original_sounds[_sound_idx[i]];
fe->volume = _sound_base_vol[i]; fe->volume = _sound_base_vol[i];
fe->priority = 0; fe->priority = 0;
} }