Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-17 21:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r6978) Use the pool macros for the SoundInternal pool

Browse Source
This commit is contained in:
tron 2006-10-28 11:32:12 +00:00
parent 1a4a7984a7
commit a97f75e439
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
newgrf_sound.c
View File

@ -10,29 +10,24 @@
#include "newgrf_engine.h" #include "newgrf_engine.h"
#include "newgrf_sound.h" #include "newgrf_sound.h"
enum {
SOUND_POOL_BLOCK_SIZE_BITS = 3, /* (1 << 3) == 8 items */
SOUND_POOL_MAX_BLOCKS = 1000,
};
static uint _sound_count = 0; static uint _sound_count = 0;
static MemoryPool _sound_pool = { "Sound", SOUND_POOL_MAX_BLOCKS, SOUND_POOL_BLOCK_SIZE_BITS, sizeof(FileEntry), NULL, NULL, 0, 0, NULL }; STATIC_POOL(SoundInternal, FileEntry, 3, 1000, NULL, NULL)
/* Allocate a new FileEntry */ /* Allocate a new FileEntry */
FileEntry *AllocateFileEntry(void) FileEntry *AllocateFileEntry(void)
{ {
if (_sound_count == _sound_pool.total_items) { if (_sound_count == GetSoundInternalPoolSize()) {
if (!AddBlockToPool(&_sound_pool)) return NULL; if (!AddBlockToPool(&_SoundInternal_pool)) return NULL;
} }
return (FileEntry*)GetItemFromPool(&_sound_pool, _sound_count++); return GetSoundInternal(_sound_count++);
} }
void InitializeSoundPool(void) void InitializeSoundPool(void)
{ {
CleanPool(&_sound_pool); CleanPool(&_SoundInternal_pool);
_sound_count = 0; _sound_count = 0;
/* Copy original sound data to the pool */ /* Copy original sound data to the pool */
@ -43,7 +38,7 @@ void InitializeSoundPool(void)
FileEntry *GetSound(uint index) FileEntry *GetSound(uint index)
{ {
if (index >= _sound_count) return NULL; if (index >= _sound_count) return NULL;
return (FileEntry*)GetItemFromPool(&_sound_pool, index); return GetSoundInternal(index);
} }